Merge remote branch 'origin/V7_dev'

[modules/paravis.git] / test / VisuPrs / 2D_viewer / CMakeLists.txt

diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt
index 98befa3cbffd5fe3c082e0eefaa6335d7768ed95..64eb08321879b504cf3f695148789a0541aefa7f 100644 (file)
--- a/test/VisuPrs/2D_viewer/CMakeLists.txt
+++ b/test/VisuPrs/2D_viewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2015  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,29 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+SET(BASE_TESTS A0)
+SET(ALL_TESTS  A0 A1)
+
+# For make test
 IF(SALOME_PARAVIS_ALL_TEST)
-  SET(TEST_NAMES A0 A1)
+  SET(TEST_NAMES ${ALL_TESTS})
 ELSE()
-  SET(TEST_NAMES A0)
+  SET(TEST_NAMES ${BASE_TESTS})
 ENDIF()
 
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME 2DVIEWER_${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/2D_viewer)
 
-FOREACH(tfile ${TEST_NAMES})
+FOREACH(tfile ${APPLICATION_TESTS})
   INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
           DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()