From ec4fa3ffab5458326b5a832aa6322d05da01c8d5 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 19 Jul 2019 07:20:18 +0200 Subject: [PATCH] With salome test support --- src/MEDLoader/Test/CMakeLists.txt | 3 +-- src/MEDLoader/Test/CTestTestfileInstall.cmake | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/MEDLoader/Test/CMakeLists.txt b/src/MEDLoader/Test/CMakeLists.txt index f8763d273..b86cba0ee 100644 --- a/src/MEDLoader/Test/CMakeLists.txt +++ b/src/MEDLoader/Test/CMakeLists.txt @@ -58,12 +58,11 @@ FOREACH(test ${BASE_TESTS}) SET_TESTS_PROPERTIES(${test} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -INSTALL(FILES MCTestLauncher.py DESTINATION ${MEDCOUPLING_INSTALL_PYTHON}) - # Application tests SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDLoader) INSTALL(TARGETS TestMEDLoader TestSauvLoader DESTINATION ${TEST_INSTALL_DIRECTORY}) +INSTALL(FILES MCTestLauncher.py DESTINATION ${TEST_INSTALL_DIRECTORY}) INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} diff --git a/src/MEDLoader/Test/CTestTestfileInstall.cmake b/src/MEDLoader/Test/CTestTestfileInstall.cmake index 172b9a9b1..6ff453f17 100644 --- a/src/MEDLoader/Test/CTestTestfileInstall.cmake +++ b/src/MEDLoader/Test/CTestTestfileInstall.cmake @@ -24,7 +24,7 @@ SET(TEST_NAMES FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_${tfile}) - ADD_TEST(${TEST_NAME} ${tfile}) + ADD_TEST(${TEST_NAME} python MCTestLauncher.py ${tfile}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} -- 2.39.2