Avoid message about unknown 'salome_iapp' within unit tests. Finalization.

diff --git a/src/ConnectorAPI/Test/CMakeLists.txt b/src/ConnectorAPI/Test/CMakeLists.txt
index c17aee4c6176074555eff62efee8766ee0231d4a..cc288b03a30dfbe9d41c1dfdd1c26254ce10d5dc 100644 (file)
--- a/src/ConnectorAPI/Test/CMakeLists.txt
+++ b/src/ConnectorAPI/Test/CMakeLists.txt
@@ -42,7 +42,7 @@ FOREACH(tfile ${TEST_NAMES})
   SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
   ADD_TEST(NAME ${TEST_NAME}
            COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/testme.py ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}")
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env};SHAPER_UNIT_TEST_IN_PROGRESS=1")
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()
 

diff --git a/src/XAO/tests/CMakeLists.txt b/src/XAO/tests/CMakeLists.txt
index 2338db3b862bc2688bb34f48c5d2e6b4373f02e9..aba7113ec252f864de1a42a3478582724eaa6d59 100644 (file)
--- a/src/XAO/tests/CMakeLists.txt
+++ b/src/XAO/tests/CMakeLists.txt
@@ -59,6 +59,6 @@ TARGET_LINK_LIBRARIES(TestXAO ${_link_LIBRARIES})
 SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 
 ADD_TEST(TestXAO TestXAO)
-SET_TESTS_PROPERTIES(TestXAO PROPERTIES ENVIRONMENT "GEOM_SRC_DIR=${PROJECT_SOURCE_DIR};${tests_env}")
+SET_TESTS_PROPERTIES(TestXAO PROPERTIES ENVIRONMENT "GEOM_SRC_DIR=${PROJECT_SOURCE_DIR};${tests_env};SHAPER_UNIT_TEST_IN_PROGRESS=1")
 
 INSTALL(TARGETS TestXAO DESTINATION ${SALOME_INSTALL_BINS})

diff --git a/test.compatibility/CMakeLists.txt b/test.compatibility/CMakeLists.txt
index 3f7621df0fe2c27607e0456e81d2325cd2cb63bb..e70db6e64f5e154c4ea29096565bddd1dde65a68 100644 (file)
--- a/test.compatibility/CMakeLists.txt
+++ b/test.compatibility/CMakeLists.txt
@@ -52,10 +52,10 @@ foreach(eachFilePath ${pyFiles};${pyFilesRestr})
   IF(EXISTS ${aTestFilePath})
     ADD_TEST(NAME ${aTestName} COMMAND ${PYTHON_EXECUTABLE} ${aTestFilePath})
     if (WIN32) # different path to libraries variable name
-      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH}"
+      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH};SHAPER_UNIT_TEST_IN_PROGRESS=1"
         LABELS "tests_compatibility")
     else()
-      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH}"
+      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH};SHAPER_UNIT_TEST_IN_PROGRESS=1"
         LABELS "tests_compatibility")
     endif()
     # Debug output...

diff --git a/test.hdfs/CMakeLists.txt b/test.hdfs/CMakeLists.txt
index d015bb4cde10eeb11cbfb6c606190533205d4d45..1ec95225348e6cc4112922acd3f053326e84ae92 100644 (file)
--- a/test.hdfs/CMakeLists.txt
+++ b/test.hdfs/CMakeLists.txt
@@ -59,10 +59,10 @@ foreach(eachFilePath ${hdfFilesRestr})
   IF(EXISTS ${aTestFilePath})
     ADD_TEST(NAME ${aTestName} COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/test.py" "$ENV{KERNEL_ROOT_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" "${aTestFilePath}")
     if (WIN32) # different path to libraries variable name
-      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH}"
+      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH};SHAPER_UNIT_TEST_IN_PROGRESS=1"
         LABELS "models_hdf")
     else()
-      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH}"
+      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH};SHAPER_UNIT_TEST_IN_PROGRESS=1"
         LABELS "models_hdf")
     endif()
     # Debug output...

diff --git a/test.models/CMakeLists.txt b/test.models/CMakeLists.txt
index b76889729c43a948e6d783a3d8609dee2cd5a1b6..6771d17646d675ae48bc80244ad57f8350974180 100644 (file)
--- a/test.models/CMakeLists.txt
+++ b/test.models/CMakeLists.txt
@@ -52,10 +52,10 @@ foreach(eachFilePath ${pyFiles};${pyFilesRestr})
   IF(EXISTS ${aTestFilePath})
     ADD_TEST(NAME ${aTestName} COMMAND ${PYTHON_EXECUTABLE} ${aTestFilePath})
     if (WIN32) # different path to libraries variable name
-      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH}"
+      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH};SHAPER_UNIT_TEST_IN_PROGRESS=1"
         LABELS "models_tests")
     else()
-      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH}"
+      SET_TESTS_PROPERTIES(${aTestName} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH};SHAPER_UNIT_TEST_IN_PROGRESS=1"
         LABELS "models_tests")
     endif()
     # Debug output...