From: Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Date: Thu, 18 Dec 2014 09:33:22 +0000 (+0100)
Subject: Adding the old tests to "make tests" procedure (first step).
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d430a408c10cd35f30df6ef12fef311660d7ab26;p=modules%2Fkernel.git

Adding the old tests to "make tests" procedure (first step).
---

diff --git a/src/Launcher/Test/CMakeLists.txt b/src/Launcher/Test/CMakeLists.txt
index 67563f7a1..a993f1d7f 100644
--- a/src/Launcher/Test/CMakeLists.txt
+++ b/src/Launcher/Test/CMakeLists.txt
@@ -19,10 +19,15 @@
 
 # --- rules ---
 
+SET(py_SCRIPTS
+    test_launcher.py
+)
+SALOME_INSTALL_SCRIPTS(${py_SCRIPTS} ${SALOME_INSTALL_SCRIPT_SCRIPTS}/Tests)
+
 IF(NOT WIN32)
   ADD_TEST(NAME SalomeLauncher
-           COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../../UnitTests/prepare_test.py
-           ${CMAKE_CURRENT_SOURCE_DIR}/test_launcher.py
+           COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_SCRIPTS}/Tests/prepare_test.py
+           ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_SCRIPTS}/Tests/test_launcher.py
            -d KERNEL_ROOT_DIR=${CMAKE_INSTALL_PREFIX}
           )
 ENDIF()
diff --git a/src/NamingService/Test/CMakeLists.txt b/src/NamingService/Test/CMakeLists.txt
index 1a8d5de47..4a61d5160 100755
--- a/src/NamingService/Test/CMakeLists.txt
+++ b/src/NamingService/Test/CMakeLists.txt
@@ -71,3 +71,11 @@ SALOME_INSTALL_SCRIPTS(TestNamingService.py ${SALOME_INSTALL_SCRIPT_PYTHON})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
+
+IF(NOT WIN32)
+  ADD_TEST(NAME NamingService
+           COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_SCRIPTS}/Tests/prepare_test.py
+           ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_PYTHON}/TestNamingService.py
+           -d KERNEL_ROOT_DIR=${CMAKE_INSTALL_PREFIX}
+          )
+ENDIF()
diff --git a/src/NamingService/Test/TestNamingService.py b/src/NamingService/Test/TestNamingService.py
index ff365a9ab..4fdf45c52 100644
--- a/src/NamingService/Test/TestNamingService.py
+++ b/src/NamingService/Test/TestNamingService.py
@@ -59,3 +59,4 @@ ret = os.spawnvp(os.P_WAIT, command[0], command)
 # kill Test process
 
 TestKiller.killProcess(runSalome.process_id)
+exit(ret)
\ No newline at end of file
diff --git a/src/SALOMETraceCollector/Test/CMakeLists.txt b/src/SALOMETraceCollector/Test/CMakeLists.txt
index c86da30ed..ae530f1d7 100755
--- a/src/SALOMETraceCollector/Test/CMakeLists.txt
+++ b/src/SALOMETraceCollector/Test/CMakeLists.txt
@@ -51,3 +51,11 @@ SALOME_INSTALL_SCRIPTS(TestSALOMETraceCollector.py ${SALOME_INSTALL_SCRIPT_PYTHO
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
+
+IF(NOT WIN32)
+  ADD_TEST(NAME TraceCollector
+           COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_SCRIPTS}/Tests/prepare_test.py
+           ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_PYTHON}/TestSALOMETraceCollector.py
+           -d KERNEL_ROOT_DIR=${CMAKE_INSTALL_PREFIX}
+          )
+ENDIF()
diff --git a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py
index 0078e1d5a..04800de65 100644
--- a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py
+++ b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py
@@ -49,3 +49,4 @@ ret = os.spawnvp(os.P_WAIT, command[0], command)
 # kill Test process 
 
 TestKiller.killProcess(runSalome.process_id)
+exit(ret)
\ No newline at end of file
diff --git a/src/UnitTests/CMakeLists.txt b/src/UnitTests/CMakeLists.txt
index b891402f2..158be534d 100755
--- a/src/UnitTests/CMakeLists.txt
+++ b/src/UnitTests/CMakeLists.txt
@@ -32,7 +32,13 @@ INCLUDE_DIRECTORIES(
 # ===============================================================
 
 # Executable scripts to be installed
+SET(py_SCRIPTS
+    UnitTests.py
+    prepare_test.py
+)
+
 SALOME_INSTALL_SCRIPTS(UnitTests.py ${SALOME_INSTALL_SCRIPT_SCRIPTS})
+SALOME_INSTALL_SCRIPTS(prepare_test.py ${SALOME_INSTALL_SCRIPT_SCRIPTS}/Tests)
 
 # ===============================================================
 # Executables targets