From 85d09ca27f95b450cb44a458951d688168055d44 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 10 Mar 2021 07:52:20 +0100 Subject: [PATCH] Factorize before adding ALL SHAPER tests into salome test mecanism --- CMakeLists.txt | 2 ++ src/ConnectorAPI/Test/CMakeLists.txt | 2 -- test.hdfs/CMakeLists.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33861baf1..f92435497 100644 --- 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 7e0b4846d..17f37d836 100644 --- 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 64f59848b..8b5d695aa 100644 --- 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") -- 2.39.2