Skip to content

Commit 821011d

Browse files
aashish24aashish24
committed
Merge pull request #1261 from UV-CDAT/fix_run_tests_buildbot
Fix run tests buildbot
2 parents 6ea8a64 + 1d4a7ef commit 821011d

6 files changed

Lines changed: 50 additions & 40 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
os:
22
- linux
3-
- osx
3+
# - osx
44

55
language: c++
66

‎CMake/cdat_modules_extra/runtest.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
# source is not portable whereas . is
3+
. "@CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh"
4+
python@PYVER@ "$@"

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,11 @@ configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat.in
729729
@ONLY
730730
)
731731

732+
configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runtest.in
733+
${CMAKE_INSTALL_PREFIX}/bin/runtest
734+
@ONLY
735+
)
736+
732737

733738
if (BUILD_TESTING)
734739
configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runpytest.in

‎testing/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# Helper macro that sets the environment correctly
55
macro (cdat_add_test name python_exe script)
66
#string (REPLACE ";" " " TEST_ARGS "${ARGN}")
7-
add_test (${name} "${python_exe}" ${script} ${ARGN})
7+
add_test(${name} "${CMAKE_INSTALL_PREFIX}/bin/runtest"
8+
${script} ${ARGN})
89
if(DEFINED ENV{UVCDAT_ANONYMOUS_LOG})
910
set_tests_properties (${name}
1011
PROPERTIES ENVIRONMENT "UVCDAT_ANONYMOUS_LOG=$ENV{UVCDAT_ANONYMOUS_LOG}"

‎testing/vcs/vtk_ui/CMakeLists.txt‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,173 +2,173 @@ set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/vcs/vtk_ui")
22
set(TEST_DIR "${cdat_SOURCE_DIR}/testing/vcs/vtk_ui")
33

44
# Button tests
5-
add_test(test_vtk_ui_button_draw
5+
cdat_add_test(test_vtk_ui_button_draw
66
"${PYTHON_EXECUTABLE}"
77
${TEST_DIR}/test_vtk_ui_button_draw.py
88
${BASELINE_DIR}/test_vtk_ui_button_draw.png
99
)
1010

11-
add_test(test_vtk_ui_button_action
11+
cdat_add_test(test_vtk_ui_button_action
1212
"${PYTHON_EXECUTABLE}"
1313
${TEST_DIR}/test_vtk_ui_button_action.py
1414
)
1515

16-
add_test(test_vtk_ui_button_corner_radius
16+
cdat_add_test(test_vtk_ui_button_corner_radius
1717
"${PYTHON_EXECUTABLE}"
1818
${TEST_DIR}/test_vtk_ui_button_corner_radius.py
1919
${BASELINE_DIR}/test_vtk_ui_button_corner_radius.png
2020
)
2121

22-
add_test(test_vtk_ui_button_dimensions
22+
cdat_add_test(test_vtk_ui_button_dimensions
2323
"${PYTHON_EXECUTABLE}"
2424
${TEST_DIR}/test_vtk_ui_button_dimensions.py
2525
${BASELINE_DIR}/test_vtk_ui_button_dimensions.png
2626
)
2727

28-
add_test(test_vtk_ui_button_states
28+
cdat_add_test(test_vtk_ui_button_states
2929
"${PYTHON_EXECUTABLE}"
3030
${TEST_DIR}/test_vtk_ui_button_states.py
3131
${BASELINE_DIR}/test_vtk_ui_button_states.png
3232
)
3333

34-
add_test(test_vtk_ui_button_click
34+
cdat_add_test(test_vtk_ui_button_click
3535
"${PYTHON_EXECUTABLE}"
3636
${TEST_DIR}/test_vtk_ui_button_click.py
3737
)
3838

39-
add_test(test_vtk_ui_button_font
39+
cdat_add_test(test_vtk_ui_button_font
4040
"${PYTHON_EXECUTABLE}"
4141
${TEST_DIR}/test_vtk_ui_button_font.py
4242
${BASELINE_DIR}/test_vtk_ui_button_font.png
4343
)
4444

45-
add_test(test_vtk_ui_button_alignment
45+
cdat_add_test(test_vtk_ui_button_alignment
4646
"${PYTHON_EXECUTABLE}"
4747
${TEST_DIR}/test_vtk_ui_button_alignment.py
4848
${BASELINE_DIR}/test_vtk_ui_button_alignment.png
4949
)
5050

51-
add_test(test_vtk_ui_button_image
51+
cdat_add_test(test_vtk_ui_button_image
5252
"${PYTHON_EXECUTABLE}"
5353
${TEST_DIR}/test_vtk_ui_button_image.py
5454
${BASELINE_DIR}/test_vtk_ui_button_image.png
5555
)
5656

57-
add_test(test_vtk_ui_button_tooltip_show
57+
cdat_add_test(test_vtk_ui_button_tooltip_show
5858
"${PYTHON_EXECUTABLE}"
5959
${TEST_DIR}/test_vtk_ui_button_tooltip_show.py
6060
${BASELINE_DIR}/test_vtk_ui_button_tooltip_show.png
6161
)
6262

63-
add_test(test_vtk_ui_button_tooltip_hide
63+
cdat_add_test(test_vtk_ui_button_tooltip_hide
6464
"${PYTHON_EXECUTABLE}"
6565
${TEST_DIR}/test_vtk_ui_button_tooltip_hide.py
6666
${BASELINE_DIR}/test_vtk_ui_button_tooltip_hide.png
6767
)
6868

69-
add_test(test_vtk_ui_slider_jumps
69+
cdat_add_test(test_vtk_ui_slider_jumps
7070
"${PYTHON_EXECUTABLE}"
7171
${TEST_DIR}/test_vtk_ui_slider_jumps.py
7272
${BASELINE_DIR}/test_vtk_ui_slider_jumps.png
7373
)
7474

75-
add_test(test_vtk_ui_textbox_highlight
75+
cdat_add_test(test_vtk_ui_textbox_highlight
7676
"${PYTHON_EXECUTABLE}"
7777
${TEST_DIR}/test_vtk_ui_textbox_highlight.py
7878
${BASELINE_DIR}/test_vtk_ui_textbox_highlight.png
7979
)
8080

81-
add_test(test_vtk_ui_label_top
81+
cdat_add_test(test_vtk_ui_label_top
8282
"${PYTHON_EXECUTABLE}"
8383
${TEST_DIR}/test_vtk_ui_label_top.py
8484
${BASELINE_DIR}/test_vtk_ui_label_top.png
8585
)
86-
add_test(test_vtk_ui_label_y
86+
cdat_add_test(test_vtk_ui_label_y
8787
"${PYTHON_EXECUTABLE}"
8888
${TEST_DIR}/test_vtk_ui_label_y.py
8989
${BASELINE_DIR}/test_vtk_ui_label_y.png
9090
)
9191

92-
add_test(test_vtk_ui_contrasting_colors
92+
cdat_add_test(test_vtk_ui_contrasting_colors
9393
"${PYTHON_EXECUTABLE}"
9494
${TEST_DIR}/test_vtk_ui_contrasting_colors.py
9595
)
9696

97-
add_test(test_vtk_ui_hsv_rgb
97+
cdat_add_test(test_vtk_ui_hsv_rgb
9898
"${PYTHON_EXECUTABLE}"
9999
${TEST_DIR}/test_vtk_ui_hsv_rgb.py
100100
)
101101

102-
add_test(test_vtk_ui_label_behaviors
102+
cdat_add_test(test_vtk_ui_label_behaviors
103103
"${PYTHON_EXECUTABLE}"
104104
${TEST_DIR}/test_vtk_ui_label_behaviors.py
105105
${BASELINE_DIR}/test_vtk_ui_label_behaviors.png
106106
)
107107

108-
add_test(test_vtk_ui_label_bounds
108+
cdat_add_test(test_vtk_ui_label_bounds
109109
"${PYTHON_EXECUTABLE}"
110110
${TEST_DIR}/test_vtk_ui_label_bounds.py
111111
)
112112

113-
add_test(test_vtk_ui_label_detach
113+
cdat_add_test(test_vtk_ui_label_detach
114114
"${PYTHON_EXECUTABLE}"
115115
${TEST_DIR}/test_vtk_ui_label_detach.py
116116
${BASELINE_DIR}/test_vtk_ui_label_detach.png
117117
)
118118

119-
add_test(test_vtk_ui_label_font_attrs
119+
cdat_add_test(test_vtk_ui_label_font_attrs
120120
"${PYTHON_EXECUTABLE}"
121121
${TEST_DIR}/test_vtk_ui_label_font_attrs.py
122122
${BASELINE_DIR}/test_vtk_ui_label_font_attrs.png
123123
)
124124

125-
add_test(test_vtk_ui_label_left
125+
cdat_add_test(test_vtk_ui_label_left
126126
"${PYTHON_EXECUTABLE}"
127127
${TEST_DIR}/test_vtk_ui_label_left.py
128128
${BASELINE_DIR}/test_vtk_ui_label_left.png
129129
)
130130

131-
add_test(test_vtk_ui_label_render
131+
cdat_add_test(test_vtk_ui_label_render
132132
"${PYTHON_EXECUTABLE}"
133133
${TEST_DIR}/test_vtk_ui_label_render.py
134134
${BASELINE_DIR}/test_vtk_ui_label_render_initial.png
135135
${BASELINE_DIR}/test_vtk_ui_label_render_color_change.png
136136
)
137137

138-
add_test(test_vtk_ui_label_show_hide
138+
cdat_add_test(test_vtk_ui_label_show_hide
139139
"${PYTHON_EXECUTABLE}"
140140
${TEST_DIR}/test_vtk_ui_label_show_hide.py
141141
${BASELINE_DIR}/test_vtk_ui_label_show_hide.png
142142
)
143143

144-
add_test(test_vtk_ui_label_text
144+
cdat_add_test(test_vtk_ui_label_text
145145
"${PYTHON_EXECUTABLE}"
146146
${TEST_DIR}/test_vtk_ui_label_text.py
147147
${BASELINE_DIR}/test_vtk_ui_label_text.png
148148
)
149149

150-
add_test(test_vtk_ui_label_x
150+
cdat_add_test(test_vtk_ui_label_x
151151
"${PYTHON_EXECUTABLE}"
152152
${TEST_DIR}/test_vtk_ui_label_x.py
153153
${BASELINE_DIR}/test_vtk_ui_label_x.png
154154
)
155155

156-
add_test(test_vtk_ui_set_font
156+
cdat_add_test(test_vtk_ui_set_font
157157
"${PYTHON_EXECUTABLE}"
158158
${TEST_DIR}/test_vtk_ui_set_font.py
159159
)
160160

161-
add_test(test_vtk_ui_text_dimensions
161+
cdat_add_test(test_vtk_ui_text_dimensions
162162
"${PYTHON_EXECUTABLE}"
163163
${TEST_DIR}/test_vtk_ui_text_dimensions.py
164164
)
165165

166-
add_test(test_vtk_ui_white_or_black
166+
cdat_add_test(test_vtk_ui_white_or_black
167167
"${PYTHON_EXECUTABLE}"
168168
${TEST_DIR}/test_vtk_ui_white_or_black.py
169169
)
170170

171-
add_test(test_vtk_ui_textbox_blank_text
171+
cdat_add_test(test_vtk_ui_textbox_blank_text
172172
"${PYTHON_EXECUTABLE}"
173173
${TEST_DIR}/test_vtk_ui_textbox_blank_text.py
174174
)

‎testing/vcsaddons/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/vcsaddons")
22

3-
add_test(vcs_addons_preview_2x2
3+
cdat_add_test(vcs_addons_preview_2x2
44
"${PYTHON_EXECUTABLE}"
55
${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcsaddons_preview_2x2.py
66
${BASELINE_DIR}/test_vcsaddons_preview_2x2.png
77
)
8-
add_test(vcs_addons_test_12_plot_one_leg_per_row
8+
cdat_add_test(vcs_addons_test_12_plot_one_leg_per_row
99
"${PYTHON_EXECUTABLE}"
1010
${cdat_SOURCE_DIR}/testing/vcsaddons/test_12_plot_one_leg_per_row.py
1111
${BASELINE_DIR}/test_12_plot_one_leg_per_row.png
1212
)
13-
add_test(vcs_addons_test_12_plot_one_leg_per_row_right
13+
cdat_add_test(vcs_addons_test_12_plot_one_leg_per_row_right
1414
"${PYTHON_EXECUTABLE}"
1515
${cdat_SOURCE_DIR}/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
1616
${BASELINE_DIR}/test_12_plot_one_leg_per_row_right.png
1717
)
18-
add_test(vcs_addons_test_EzTemplate_12_plots_margins_thickness
18+
cdat_add_test(vcs_addons_test_EzTemplate_12_plots_margins_thickness
1919
"${PYTHON_EXECUTABLE}"
2020
${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py
2121
${BASELINE_DIR}/test_EzTemplate_12_plots_margins_thickness.png
2222
)
23-
add_test(vcs_addons_test_EzTemplate_12_plots_legd_direction
23+
cdat_add_test(vcs_addons_test_EzTemplate_12_plots_legd_direction
2424
"${PYTHON_EXECUTABLE}"
2525
${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
2626
${BASELINE_DIR}/test_EzTemplate_12_plots_legd_direction.png
2727
)
28-
add_test(vcs_addons_test_EzTemplate_12_plots_mix_glb_local
28+
cdat_add_test(vcs_addons_test_EzTemplate_12_plots_mix_glb_local
2929
"${PYTHON_EXECUTABLE}"
3030
${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
3131
${BASELINE_DIR}/test_EzTemplate_12_plots_mix_glb_local.png
3232
)
33-
add_test(vcs_addons_test_EzTemplate_12_plots_spacing
33+
cdat_add_test(vcs_addons_test_EzTemplate_12_plots_spacing
3434
"${PYTHON_EXECUTABLE}"
3535
${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
3636
${BASELINE_DIR}/test_EzTemplate_12_plots_spacing.png
3737
)
3838

3939
if (CDAT_DOWNLOAD_SAMPLE_DATA)
40-
add_test(vcs_addons_EzTemplate_2x2
40+
cdat_add_test(vcs_addons_EzTemplate_2x2
4141
"${PYTHON_EXECUTABLE}"
4242
${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_EzTemplate_2x2.py
4343
${BASELINE_DIR}/test_vcs_addons_EzTemplate_2x2.png

0 commit comments

Comments
 (0)
⚡