Factorize before adding ALL SHAPER tests into salome test mecanism

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33861baf115472669be8bdc74ae61aac63dcdb5f..f924354970607af37a71b74b759b9268fc7a4ff8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,8 @@ SET(${PROJECT_NAME}_MAJOR_VERSION 9)
 SET(${PROJECT_NAME}_MINOR_VERSION 6)
 SET(${PROJECT_NAME}_PATCH_VERSION 0)
 SET(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_VERSION})
+SET(COMPONENT_NAME SHAPER)
+SET(SALOME_TEST_LABEL_ADV SHAPER_ADV)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)

diff --git a/src/ConnectorAPI/Test/CMakeLists.txt b/src/ConnectorAPI/Test/CMakeLists.txt
index 7e0b4846d20790be453ef33eb0bb6af0f937b8e0..17f37d836db7562e90b1ac73b9c7ecc96ce8c34c 100644 (file)
--- a/src/ConnectorAPI/Test/CMakeLists.txt
+++ b/src/ConnectorAPI/Test/CMakeLists.txt
@@ -19,8 +19,6 @@
 
 INCLUDE(tests.set)
 
-SET(COMPONENT_NAME SHAPER)
-
 SET(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/ConnectorAPI")
 
 SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)

diff --git a/test.hdfs/CMakeLists.txt b/test.hdfs/CMakeLists.txt
index 64f59848b0773fa50d4eda1519a08ac2d97385f3..8b5d695aa18ba34fed2d26a45e28fc0c8771914a 100644 (file)
--- a/test.hdfs/CMakeLists.txt
+++ b/test.hdfs/CMakeLists.txt
@@ -41,7 +41,6 @@ foreach(eachFilePath IN LISTS hdfFilesCur hdfFilesRestr)
   endif()
 endforeach()
 
-SET(COMPONENT_NAME SHAPER)
 SET(TIMEOUT 600)
 
 SET(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/HDFs")