Merge pull request #1261 from UV-CDAT/fix_run_tests_buildbot

Fix run tests buildbot

.travis.yml

@@ -1,6 +1,6 @@
 os:
   - linux
-  - osx
+#  - osx
 
 language: c++
 

CMake/cdat_modules_extra/runtest.in

@@ -0,0 +1,4 @@
+#!/bin/bash
+# source is not portable whereas . is
+. "@CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh"
+python@PYVER@ "$@"

CMakeLists.txt

@@ -729,6 +729,11 @@ configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat.in
   @ONLY
 )
 
+configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runtest.in
+  ${CMAKE_INSTALL_PREFIX}/bin/runtest
+  @ONLY
+)
+
 
 if (BUILD_TESTING)
   configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runpytest.in

testing/CMakeLists.txt

@@ -4,7 +4,8 @@
 # Helper macro that sets the environment correctly
 macro (cdat_add_test name python_exe script)
   #string (REPLACE ";" " " TEST_ARGS "${ARGN}")
-  add_test (${name} "${python_exe}" ${script} ${ARGN})
+  add_test(${name} "${CMAKE_INSTALL_PREFIX}/bin/runtest"
+           ${script} ${ARGN})
   if(DEFINED ENV{UVCDAT_ANONYMOUS_LOG})
     set_tests_properties (${name}
       PROPERTIES ENVIRONMENT "UVCDAT_ANONYMOUS_LOG=$ENV{UVCDAT_ANONYMOUS_LOG}"

testing/vcs/vtk_ui/CMakeLists.txt

@@ -2,173 +2,173 @@ set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/vcs/vtk_ui")
 set(TEST_DIR "${cdat_SOURCE_DIR}/testing/vcs/vtk_ui")
 
 # Button tests
-add_test(test_vtk_ui_button_draw
+cdat_add_test(test_vtk_ui_button_draw
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_draw.py
   ${BASELINE_DIR}/test_vtk_ui_button_draw.png
 )
 
-add_test(test_vtk_ui_button_action
+cdat_add_test(test_vtk_ui_button_action
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_action.py
 )
 
-add_test(test_vtk_ui_button_corner_radius
+cdat_add_test(test_vtk_ui_button_corner_radius
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_corner_radius.py
   ${BASELINE_DIR}/test_vtk_ui_button_corner_radius.png
 )
 
-add_test(test_vtk_ui_button_dimensions
+cdat_add_test(test_vtk_ui_button_dimensions
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_dimensions.py
   ${BASELINE_DIR}/test_vtk_ui_button_dimensions.png
 )
 
-add_test(test_vtk_ui_button_states
+cdat_add_test(test_vtk_ui_button_states
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_states.py
   ${BASELINE_DIR}/test_vtk_ui_button_states.png
 )
 
-add_test(test_vtk_ui_button_click
+cdat_add_test(test_vtk_ui_button_click
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_click.py
 )
 
-add_test(test_vtk_ui_button_font
+cdat_add_test(test_vtk_ui_button_font
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_font.py
   ${BASELINE_DIR}/test_vtk_ui_button_font.png
 )
 
-add_test(test_vtk_ui_button_alignment
+cdat_add_test(test_vtk_ui_button_alignment
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_alignment.py
   ${BASELINE_DIR}/test_vtk_ui_button_alignment.png
 )
 
-add_test(test_vtk_ui_button_image
+cdat_add_test(test_vtk_ui_button_image
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_image.py
   ${BASELINE_DIR}/test_vtk_ui_button_image.png
 )
 
-add_test(test_vtk_ui_button_tooltip_show
+cdat_add_test(test_vtk_ui_button_tooltip_show
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_tooltip_show.py
   ${BASELINE_DIR}/test_vtk_ui_button_tooltip_show.png
 )
 
-add_test(test_vtk_ui_button_tooltip_hide
+cdat_add_test(test_vtk_ui_button_tooltip_hide
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_button_tooltip_hide.py
   ${BASELINE_DIR}/test_vtk_ui_button_tooltip_hide.png
 )
 
-add_test(test_vtk_ui_slider_jumps
+cdat_add_test(test_vtk_ui_slider_jumps
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_slider_jumps.py
   ${BASELINE_DIR}/test_vtk_ui_slider_jumps.png
 )
 
-add_test(test_vtk_ui_textbox_highlight
+cdat_add_test(test_vtk_ui_textbox_highlight
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_textbox_highlight.py
   ${BASELINE_DIR}/test_vtk_ui_textbox_highlight.png
 )
 
-add_test(test_vtk_ui_label_top
+cdat_add_test(test_vtk_ui_label_top
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_top.py
   ${BASELINE_DIR}/test_vtk_ui_label_top.png
 )
-add_test(test_vtk_ui_label_y
+cdat_add_test(test_vtk_ui_label_y
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_y.py
   ${BASELINE_DIR}/test_vtk_ui_label_y.png
 )
 
-add_test(test_vtk_ui_contrasting_colors
+cdat_add_test(test_vtk_ui_contrasting_colors
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_contrasting_colors.py
 )
 
-add_test(test_vtk_ui_hsv_rgb
+cdat_add_test(test_vtk_ui_hsv_rgb
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_hsv_rgb.py
 )
 
-add_test(test_vtk_ui_label_behaviors
+cdat_add_test(test_vtk_ui_label_behaviors
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_behaviors.py
   ${BASELINE_DIR}/test_vtk_ui_label_behaviors.png
 )
 
-add_test(test_vtk_ui_label_bounds
+cdat_add_test(test_vtk_ui_label_bounds
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_bounds.py
 )
 
-add_test(test_vtk_ui_label_detach
+cdat_add_test(test_vtk_ui_label_detach
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_detach.py
   ${BASELINE_DIR}/test_vtk_ui_label_detach.png
 )
 
-add_test(test_vtk_ui_label_font_attrs
+cdat_add_test(test_vtk_ui_label_font_attrs
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_font_attrs.py
   ${BASELINE_DIR}/test_vtk_ui_label_font_attrs.png
 )
 
-add_test(test_vtk_ui_label_left
+cdat_add_test(test_vtk_ui_label_left
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_left.py
   ${BASELINE_DIR}/test_vtk_ui_label_left.png
 )
 
-add_test(test_vtk_ui_label_render
+cdat_add_test(test_vtk_ui_label_render
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_render.py
   ${BASELINE_DIR}/test_vtk_ui_label_render_initial.png
   ${BASELINE_DIR}/test_vtk_ui_label_render_color_change.png
 )
 
-add_test(test_vtk_ui_label_show_hide
+cdat_add_test(test_vtk_ui_label_show_hide
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_show_hide.py
   ${BASELINE_DIR}/test_vtk_ui_label_show_hide.png
 )
 
-add_test(test_vtk_ui_label_text
+cdat_add_test(test_vtk_ui_label_text
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_text.py
   ${BASELINE_DIR}/test_vtk_ui_label_text.png
 )
 
-add_test(test_vtk_ui_label_x
+cdat_add_test(test_vtk_ui_label_x
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_label_x.py
   ${BASELINE_DIR}/test_vtk_ui_label_x.png
 )
 
-add_test(test_vtk_ui_set_font
+cdat_add_test(test_vtk_ui_set_font
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_set_font.py
 )
 
-add_test(test_vtk_ui_text_dimensions
+cdat_add_test(test_vtk_ui_text_dimensions
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_text_dimensions.py
 )
 
-add_test(test_vtk_ui_white_or_black
+cdat_add_test(test_vtk_ui_white_or_black
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_white_or_black.py
 )
 
-add_test(test_vtk_ui_textbox_blank_text
+cdat_add_test(test_vtk_ui_textbox_blank_text
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_textbox_blank_text.py
 )

testing/vcsaddons/CMakeLists.txt

@@ -1,43 +1,43 @@
 set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/vcsaddons")
 
-add_test(vcs_addons_preview_2x2
+cdat_add_test(vcs_addons_preview_2x2
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcsaddons_preview_2x2.py
   ${BASELINE_DIR}/test_vcsaddons_preview_2x2.png
 )
-add_test(vcs_addons_test_12_plot_one_leg_per_row
+cdat_add_test(vcs_addons_test_12_plot_one_leg_per_row
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcsaddons/test_12_plot_one_leg_per_row.py
   ${BASELINE_DIR}/test_12_plot_one_leg_per_row.png
 )
-add_test(vcs_addons_test_12_plot_one_leg_per_row_right
+cdat_add_test(vcs_addons_test_12_plot_one_leg_per_row_right
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
   ${BASELINE_DIR}/test_12_plot_one_leg_per_row_right.png
 )
-add_test(vcs_addons_test_EzTemplate_12_plots_margins_thickness
+cdat_add_test(vcs_addons_test_EzTemplate_12_plots_margins_thickness
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py
   ${BASELINE_DIR}/test_EzTemplate_12_plots_margins_thickness.png
 )
-add_test(vcs_addons_test_EzTemplate_12_plots_legd_direction
+cdat_add_test(vcs_addons_test_EzTemplate_12_plots_legd_direction
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
   ${BASELINE_DIR}/test_EzTemplate_12_plots_legd_direction.png
 )
-add_test(vcs_addons_test_EzTemplate_12_plots_mix_glb_local
+cdat_add_test(vcs_addons_test_EzTemplate_12_plots_mix_glb_local
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
   ${BASELINE_DIR}/test_EzTemplate_12_plots_mix_glb_local.png
 )
-add_test(vcs_addons_test_EzTemplate_12_plots_spacing
+cdat_add_test(vcs_addons_test_EzTemplate_12_plots_spacing
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
   ${BASELINE_DIR}/test_EzTemplate_12_plots_spacing.png
 )
 
 if (CDAT_DOWNLOAD_SAMPLE_DATA)
-  add_test(vcs_addons_EzTemplate_2x2
+  cdat_add_test(vcs_addons_EzTemplate_2x2
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_EzTemplate_2x2.py
     ${BASELINE_DIR}/test_vcs_addons_EzTemplate_2x2.png