Merge branch 'V7_dev'

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

diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index b0a39a9..939702c
--- a/test/VisuPrs/ScalarMap/CMakeLists.txt
+++ b/test/VisuPrs/ScalarMap/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2016  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,16 +17,34 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+SET(BASE_TESTS A1 B0 E0 F3 G0)
+SET(ALL_TESTS  A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9
+  F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2)
+
+# For make test
 IF(SALOME_PARAVIS_ALL_TEST)
-  SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 
-                 F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G2)
+  SET(TEST_NAMES ${ALL_TESTS})
 ELSE()
-  SET(TEST_NAMES A1 B0 E0 F3 G0)
+  SET(TEST_NAMES ${BASE_TESTS})
 ENDIF()
 
 FOREACH(tfile ${TEST_NAMES})
-  ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE}
-                    ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-  SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+  SET(TEST_NAME SCALARMAP_${tfile})
+  ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}")
 ENDFOREACH()
+
+# Application tests
+SET(APPLICATION_TESTS ${ALL_TESTS})
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ScalarMap)
+
+FOREACH(tfile ${APPLICATION_TESTS})
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
+ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)