Merge branch 'origin/agy/feedbackads140304'

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

diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt
index 98ae1def02c971f787d52b718667b2ca973d6a54..fd12c304bf82b4489a9d687e60ff33bb87b04403 100755 (executable)
--- a/test/VisuPrs/Animation/CMakeLists.txt
+++ b/test/VisuPrs/Animation/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
@@ -17,40 +17,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A2
-      A4
-      A7
-      A8
-      B2
-      B5
-      B6  
-      C0
-      C1
-      C3
-      C8
-      D1
-      D2
-      D6
-      D9
-      E0
-      E4
-      E7
-      E8
-      F2
-      F5
-      F6
-      G0
-      G3
-      G4
-      G8
-      H1
-      H2
-      )
-    SET(TIMEOUT 1500)
-    ADD_TEST(ANIMATION_${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(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+IF(SALOME_PARAVIS_ALL_TEST)
+  SET(TEST_NAMES A0 A1 A2 A4 A7 A8 B2 B5 B6 C0 C1 C3 C8 D1 D2 D6 D9 
+                 E0 E4 E7 E8 F2 F5 F6 G0 G3 G4 G8 H1 H2)
+ELSE()
+  SET(TEST_NAMES A1 B2 C0 D1 E0 F2 G0 H1)
+ENDIF()
+  
+FOREACH(tfile ${TEST_NAMES})
+  ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} 
+                    ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()