0022071: EDF 2497 PARAVIS : Porting of VISU tests for PARAVIS

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

diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt
index 453222bc19ff503cde1f24ac45b82412ed48e859..ef5ae26358cee26ad66d3cff7b5a1aa3fab05835 100644 (file)
--- a/test/VisuPrs/ScalarMap/CMakeLists.txt
+++ b/test/VisuPrs/ScalarMap/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,6 +32,7 @@ IF (PYTHON_EXECUTABLE)
       B0
       B1
       B2
+      B3
       E0
       E1
       E2      
@@ -42,7 +43,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0      
       F1
       F2
       F3
@@ -56,7 +56,8 @@ IF (PYTHON_EXECUTABLE)
       G1
       G2
       )
-    ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
-    SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED")
+    SET(TIMEOUT 10000)
+    ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+    SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
\ No newline at end of file
+ENDIF (PYTHON_EXECUTABLE)