From 3b7dba3a025f3fc28b0e553941f0048cc5e049d1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Aguerre?= <cedric.aguerre@edf.fr>
Date: Thu, 16 Jun 2016 17:48:39 +0200
Subject: [PATCH] [salome test] Prefix tests name with component name

---
 src/bases/Test/CTestTestfileInstall.cmake       | 17 ++++++++++-------
 src/engine/Test/CTestTestfileInstall.cmake      | 16 +++++++++-------
 src/pmml/Test/CTestTestfileInstall.cmake        | 11 +++++++----
 src/runtime/Test/CTestTestfileInstall.cmake     |  9 +++++----
 src/yacsloader/Test/CTestTestfileInstall.cmake  | 15 +++++++++------
 .../Test/CTestTestfileInstall.cmake             | 14 ++++++++------
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/bases/Test/CTestTestfileInstall.cmake b/src/bases/Test/CTestTestfileInstall.cmake
index dcd8b4c17..8094c8d8b 100644
--- a/src/bases/Test/CTestTestfileInstall.cmake
+++ b/src/bases/Test/CTestTestfileInstall.cmake
@@ -18,13 +18,16 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(InitTests InitTests)
-  SET_TESTS_PROPERTIES(InitTests PROPERTIES
-                                 LABELS "${COMPONENT_NAME}"
+  SET(TEST_NAME ${COMPONENT_NAME}_InitTests)
+  ADD_TEST(${TEST_NAME} InitTests)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
                       )
-  ADD_TEST(TestBases TestBases)
-  SET_TESTS_PROPERTIES(TestBases PROPERTIES
-                                 LABELS "${COMPONENT_NAME}"
-                                 ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+
+  SET(TEST_NAME ${COMPONENT_NAME}_TestBases)
+  ADD_TEST(${TEST_NAME} TestBases)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()
diff --git a/src/engine/Test/CTestTestfileInstall.cmake b/src/engine/Test/CTestTestfileInstall.cmake
index 80d991874..5af49e865 100644
--- a/src/engine/Test/CTestTestfileInstall.cmake
+++ b/src/engine/Test/CTestTestfileInstall.cmake
@@ -18,14 +18,16 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(TestEngine TestEngine)
-  SET_TESTS_PROPERTIES(TestEngine PROPERTIES
-                                  LABELS "${COMPONENT_NAME}"
+  SET(TEST_NAME ${COMPONENT_NAME}_TestEngine)
+  ADD_TEST(${TEST_NAME} TestEngine)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
                       )
 
-  ADD_TEST(IntegrationTestEngine IntegrationTestEngine)
-  SET_TESTS_PROPERTIES(IntegrationTestEngine PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_IntegrationTestEngine)
+  ADD_TEST(${TEST_NAME} IntegrationTestEngine)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()
diff --git a/src/pmml/Test/CTestTestfileInstall.cmake b/src/pmml/Test/CTestTestfileInstall.cmake
index 0b19971c3..6879c57c7 100644
--- a/src/pmml/Test/CTestTestfileInstall.cmake
+++ b/src/pmml/Test/CTestTestfileInstall.cmake
@@ -18,8 +18,11 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(YacsTestPMML TestPMML)
-  SET_TESTS_PROPERTIES(YacsTestPMML PROPERTIES LABELS "${COMPONENT_NAME}")
-  ADD_TEST(YacsPMMLBasicsTest python pmml_swig/PMMLBasicsTestLauncher.py)
-  SET_TESTS_PROPERTIES(YacsPMMLBasicsTest PROPERTIES LABELS "${COMPONENT_NAME}")
+  SET(TEST_NAME ${COMPONENT_NAME}_YacsTestPMML)
+  ADD_TEST(${TEST_NAME} TestPMML)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+
+  SET(TEST_NAME ${COMPONENT_NAME}_YacsPMMLBasicsTest)
+  ADD_TEST(${TEST_NAME} python pmml_swig/PMMLBasicsTestLauncher.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDIF(NOT WIN32)
diff --git a/src/runtime/Test/CTestTestfileInstall.cmake b/src/runtime/Test/CTestTestfileInstall.cmake
index 976bed760..6b4aac59d 100644
--- a/src/runtime/Test/CTestTestfileInstall.cmake
+++ b/src/runtime/Test/CTestTestfileInstall.cmake
@@ -19,9 +19,10 @@
 
 IF(NOT WIN32)
   SET(SHELL /bin/sh)
-  ADD_TEST(YacsRuntimeTest ${SHELL} ./runtimeTest.sh)
-  SET_TESTS_PROPERTIES(YacsRuntimeTest PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_YacsRuntimeTest)
+  ADD_TEST(${TEST_NAME} ${SHELL} ./runtimeTest.sh)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()
diff --git a/src/yacsloader/Test/CTestTestfileInstall.cmake b/src/yacsloader/Test/CTestTestfileInstall.cmake
index 955bf4515..ee01380cb 100644
--- a/src/yacsloader/Test/CTestTestfileInstall.cmake
+++ b/src/yacsloader/Test/CTestTestfileInstall.cmake
@@ -19,10 +19,13 @@
 
 # IF(NOT WIN32)
 #   SET(SHELL /bin/sh)
-#   ADD_TEST(YacsLoaderTest python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./runYacsLoaderTest.sh)
-#   SET_TESTS_PROPERTIES(YacsLoaderTest PROPERTIES
-#                                      LABELS "${COMPONENT_NAME}"
-#                                      ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}")
-#   ADD_TEST(YacsPmmlExeTest ${SHELL} ./PmmlExeTest.sh)
-#   SET_TESTS_PROPERTIES(YacsPmmlExeTest PROPERTIES LABELS "${COMPONENT_NAME}")
+#   SET(TEST_NAME ${COMPONENT_NAME}_YacsLoaderTest)
+#   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./runYacsLoaderTest.sh)
+#   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+#                                     LABELS "${COMPONENT_NAME}"
+#                                     ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}")
+
+#   SET(TEST_NAME ${COMPONENT_NAME}_YacsPmmlExeTest)
+#   ADD_TEST(${TEST_NAME} ${SHELL} ./PmmlExeTest.sh)
+#   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 # ENDIF()
diff --git a/src/yacsloader_swig/Test/CTestTestfileInstall.cmake b/src/yacsloader_swig/Test/CTestTestfileInstall.cmake
index ca3f8a859..2e485b49d 100644
--- a/src/yacsloader_swig/Test/CTestTestfileInstall.cmake
+++ b/src/yacsloader_swig/Test/CTestTestfileInstall.cmake
@@ -18,13 +18,15 @@
 #
 
 # IF(NOT WIN32)
-#   ADD_TEST(YacsLoaderTest_swig python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./runUnitTest.sh)
-#   SET_TESTS_PROPERTIES(YacsLoaderTest_swig PROPERTIES
-#                                      LABELS "${COMPONENT_NAME}"
+#   SET(TEST_NAME ${COMPONENT_NAME}_YacsLoaderTest_swig)
+#   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./runUnitTest.sh)
+#   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+#                                     LABELS "${COMPONENT_NAME}"
 #                       )
 
-#   ADD_TEST(StdAloneYacsLoaderTest1 python ${SALOME_TEST_DRIVER} ${TIMEOUT} python StdAloneYacsLoaderTest1.py)
-#   SET_TESTS_PROPERTIES(StdAloneYacsLoaderTest1 PROPERTIES
-#                                      LABELS "${COMPONENT_NAME}"
+#   SET(TEST_NAME ${COMPONENT_NAME}_StdAloneYacsLoaderTest1)
+#   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} python StdAloneYacsLoaderTest1.py)
+#   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+#                                     LABELS "${COMPONENT_NAME}"
 #                       )
 # ENDIF()
-- 
2.39.2