Merge branch 'origin/agy/feedbackads140304'

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

diff --git a/test/VisuPrs/united/CMakeLists.txt b/test/VisuPrs/united/CMakeLists.txt
index ac9a7f983e15bad3cbbd985cf8f152151f900f79..c6ee45380f0473026bb60426964301a8f2ba547b 100644 (file)
--- a/test/VisuPrs/united/CMakeLists.txt
+++ b/test/VisuPrs/united/CMakeLists.txt
@@ -17,16 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A1
-      A2
-      A4
-      A5
-      B0
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(UNITED_${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(UNITED_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+IF(SALOME_PARAVIS_ALL_TEST)
+  SET(TEST_NAMES A1 A2 A4 A5 B0)
+ELSE()
+  SET(TEST_NAMES A2 B0)
+ENDIF()
+
+FOREACH(tfile ${TEST_NAMES})
+  ADD_TEST(UNITED_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE}
+                    ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(UNITED_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(UNITED_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()