some fixes in tests

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

diff --git a/test/VisuPrs/dump_study/CMakeLists.txt b/test/VisuPrs/dump_study/CMakeLists.txt
index 9a0c7ded37739159a21fddd2d3f4f1064c3b767e..95979907a062f2a42da8c999f41ed7fa1a833644 100644 (file)
--- a/test/VisuPrs/dump_study/CMakeLists.txt
+++ b/test/VisuPrs/dump_study/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2015  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,26 +17,15 @@
 # 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
-      B3
-      B4
-      B5
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(DUMPSTUDY_${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(DUMPSTUDY_${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 A8 A9 B0 B1 B3 B4 B5)
+ELSE()
+  SET(TEST_NAMES A0 B0)
+ENDIF()
+
+FOREACH(tfile ${TEST_NAMES})
+  ADD_TEST(DUMPSTUDY_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE}
+                    ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(DUMPSTUDY_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(DUMPSTUDY_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()