Merge branch 'origin/abn/newpy_pv4-1'

[modules/paravis.git] / test / VisuPrs / bugs / CMakeLists.txt

diff --git a/test/VisuPrs/bugs/CMakeLists.txt b/test/VisuPrs/bugs/CMakeLists.txt
index 81e00821f1cb910b21a11ddad1c6d3ce3dff8b8c..ab1f0f9541968a0e3fb43c638d57e180a4d81db2 100644 (file)
--- a/test/VisuPrs/bugs/CMakeLists.txt
+++ b/test/VisuPrs/bugs/CMakeLists.txt
@@ -17,35 +17,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6
-      A7
-      A9
-      B1
-      C3
-      C4
-      C5
-      C6
-      C7
-      C8
-      C9
-      D0
-      D1
-      D3
-      D5
-      D6
-      D7
-      E0
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(BUGS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
-    SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+IF(SALOME_PARAVIS_ALL_TEST)
+  SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C4 C5 C6 C7 C8 C9
+                 D0 D1 D3 D5 D6 D7 E0)
+ELSE()
+  SET(TEST_NAMES A0 B1 C3 D0 E0)
+ENDIF()
+
+FOREACH(tfile ${TEST_NAMES})
+  ADD_TEST(BUGS_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} 
+                    ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()