Skip to content

Commit 0fa92e7

Browse files
committed
Merge pull request #1534 from UV-CDAT/skip_label_test_for_redhat_only
Skip label test for redhat only
2 parents 8527061 + c0d646b commit 0fa92e7

File tree

1 file changed

+41
-34
lines changed

1 file changed

+41
-34
lines changed

testing/vcs/CMakeLists.txt

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ cdat_add_test(vcs_verify_create_get
3131
"${PYTHON_EXECUTABLE}"
3232
${cdat_SOURCE_DIR}/testing/vcs/test_create_get.py
3333
)
34-
cdat_add_test(vcs_test_antialiasing
35-
"${PYTHON_EXECUTABLE}"
36-
${cdat_SOURCE_DIR}/testing/vcs/test_vcs_antialiasing.py
37-
)
34+
if (NOT EXISTS /etc/redhat-release)
35+
cdat_add_test(vcs_test_antialiasing
36+
"${PYTHON_EXECUTABLE}"
37+
${cdat_SOURCE_DIR}/testing/vcs/test_vcs_antialiasing.py
38+
)
39+
endif()
3840
cdat_add_test(vcs_verify_init
3941
"${PYTHON_EXECUTABLE}"
4042
${cdat_SOURCE_DIR}/testing/vcs/test_vcs_init.py
@@ -527,26 +529,29 @@ cdat_add_test(vcs_test_taylor_2_quads
527529
${cdat_SOURCE_DIR}/testing/vcs/test_meshfill_draw_mesh.py
528530
${BASELINE_DIR}/test_meshfill_draw_mesh.png
529531
)
530-
cdat_add_test(vcs_test_isoline_labels_multi_label_input_types
531-
"${PYTHON_EXECUTABLE}"
532-
"${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py"
533-
"${BASELINE_DIR}/test_vcs_isoline_labels_multi_label_input_types.png"
534-
)
535-
cdat_add_test(vcs_test_isoline_labels
536-
"${PYTHON_EXECUTABLE}"
537-
"${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labels.py"
538-
"${BASELINE_DIR}/test_isoline_labels.png"
539-
)
540-
cdat_add_test(vcs_test_isoline_labelskipdistance
541-
"${PYTHON_EXECUTABLE}"
542-
"${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labelskipdistance.py"
543-
"${BASELINE_DIR}/test_isoline_labelskipdistance.png"
544-
)
545-
cdat_add_test(vcs_test_isofill_isoline_labels
546-
"${PYTHON_EXECUTABLE}"
547-
"${cdat_SOURCE_DIR}/testing/vcs/test_isofill_isoline_labels.py"
548-
"${BASELINE_DIR}/test_isofill_isoline_labels.png"
549-
)
532+
# @dlonie is looking into why RH6 fails for these
533+
if (NOT EXISTS /etc/redhat-release)
534+
cdat_add_test(vcs_test_isoline_labels_multi_label_input_types
535+
"${PYTHON_EXECUTABLE}"
536+
"${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py"
537+
"${BASELINE_DIR}/test_vcs_isoline_labels_multi_label_input_types.png"
538+
)
539+
cdat_add_test(vcs_test_isoline_labels
540+
"${PYTHON_EXECUTABLE}"
541+
"${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labels.py"
542+
"${BASELINE_DIR}/test_isoline_labels.png"
543+
)
544+
cdat_add_test(vcs_test_isoline_labelskipdistance
545+
"${PYTHON_EXECUTABLE}"
546+
"${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labelskipdistance.py"
547+
"${BASELINE_DIR}/test_isoline_labelskipdistance.png"
548+
)
549+
cdat_add_test(vcs_test_isofill_isoline_labels
550+
"${PYTHON_EXECUTABLE}"
551+
"${cdat_SOURCE_DIR}/testing/vcs/test_isofill_isoline_labels.py"
552+
"${BASELINE_DIR}/test_isofill_isoline_labels.png"
553+
)
554+
endif()
550555
cdat_add_test(vcs_test_oned_level_axis
551556
"${PYTHON_EXECUTABLE}"
552557
${cdat_SOURCE_DIR}/testing/vcs/test_oned_level_axis.py
@@ -666,16 +671,18 @@ cdat_add_test(vcs_test_taylor_2_quads
666671
${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_colored.py
667672
${BASELINE_DIR}
668673
)
669-
cdat_add_test(vcs_test_animate_isoline_text_labels
670-
"${PYTHON_EXECUTABLE}"
671-
${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_text_labels.py
672-
${BASELINE_DIR}
673-
)
674-
cdat_add_test(vcs_test_animate_isoline_text_labels_colored
675-
"${PYTHON_EXECUTABLE}"
676-
${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_text_labels_colored.py
677-
${BASELINE_DIR}
678-
)
674+
if (NOT EXISTS /etc/redhat-release)
675+
cdat_add_test(vcs_test_animate_isoline_text_labels
676+
"${PYTHON_EXECUTABLE}"
677+
${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_text_labels.py
678+
${BASELINE_DIR}
679+
)
680+
cdat_add_test(vcs_test_animate_isoline_text_labels_colored
681+
"${PYTHON_EXECUTABLE}"
682+
${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_text_labels_colored.py
683+
${BASELINE_DIR}
684+
)
685+
endif()
679686
endif()
680687

681688
cdat_add_test(vcs_test_endconfigure

0 commit comments

Comments
 (0)