X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;fp=test%2FCMakeLists.txt;h=e5817ca3d3ca1431b8c7c649cfc24ba4e67c1283;hp=1c0ac0b1437c999a384506e86eae6c5e2ccddaf4;hb=4cf07a14111e98e8889620ee7e6371574c31a50c;hpb=d9f4b53e489dd5857db264ede6acded7b076c9f1

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1c0ac0b14..e5817ca3d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,23 +20,47 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(tests.set)
+
+SET(RESTRICTED_ROOT_DIR $ENV{RESTRICTED_ROOT_DIR} CACHE PATH "Path to the restricted repository")
+SET(TEST_INSTALL_DIRECTORY ${SMESH_TEST_DIR}/other)
+
+# Install 'salome test' staff
+# ---------------------------
+
+SALOME_CONFIGURE_FILE(CTestTestfileInstall.cmake
+                      ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CTestTestfile.cmake
+                      INSTALL ${TEST_INSTALL_DIRECTORY})
+INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})
+INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${SESSION_FREE_TESTS} ${OTHER_FILES} DESTINATION ${TEST_INSTALL_DIRECTORY})
+INSTALL(DIRECTORY data DESTINATION ${TEST_INSTALL_DIRECTORY})
+
+# Add tests for 'make test'
+# -------------------------
+
 SALOME_GENERATE_TESTS_ENVIRONMENT(_test_env)
-SET(_test_helper ${CMAKE_SOURCE_DIR}/doc/salome/examples/testme.py)
 
-# Tests from RESTRICTED repository -----------------------------------
+# 1. Tests from here
+# ------------------
 
-SET(RESTRICTED_ROOT_DIR $ENV{RESTRICTED_ROOT_DIR} CACHE PATH "Path to the restricted repository")
+FOREACH(_test ${GOOD_TESTS})
+  GET_FILENAME_COMPONENT(testname ${_test} NAME_WE)
+  ADD_TEST(NAME ${testname}
+           COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/test/test_helper.py ${CMAKE_CURRENT_SOURCE_DIR}/${_test})
+  SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}" LABELS "tests")
+ENDFOREACH()
+
+# 2. Tests from RESTRICTED repository
+# -----------------------------------
 
 IF(WITH_SHAPER_STUDY AND EXISTS ${RESTRICTED_ROOT_DIR})
   FILE(GLOB _restricted_tests "${RESTRICTED_ROOT_DIR}/SMESH/*.py")
   FOREACH(_test ${_restricted_tests})
     GET_FILENAME_COMPONENT(_test_name ${_test} NAME_WE)
     ADD_TEST(NAME ${_test_name}
-             COMMAND ${PYTHON_EXECUTABLE} -B ${_test_helper} ${_test})
-    SET_TESTS_PROPERTIES(${_test_name} PROPERTIES ENVIRONMENT "${_test_env}")
+             COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/test/test_helper.py ${_test})
+    SET_TESTS_PROPERTIES(${_test_name} PROPERTIES ENVIRONMENT "${_test_env}" LABELS "restricted")
   ENDFOREACH()
 ELSE()
   MESSAGE(WARNING "Tests from RESTRICTED repository aren't available")
 ENDIF()
-
-# --------------------------------------------------------------------