Merge from V7_3_BR branch 18/12/2013

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

diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt
index d936dea572d2775904db5f55cb0a8bb787ba8230..d280a555e6e95d36993b42b9591d59564b7be0be 100755 (executable)
--- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt
+++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt
@@ -17,46 +17,10 @@
 # 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
-      A8
-      A9
-      B0
-      B1
-      B2
-      E0
-      E1
-      E2
-      E3      
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7      
-      F8
-      F9
-      G0
-      G1
-      G2           
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(ISOSURFACES_${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(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 
+              E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G2)
+  ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()