From 2675842ccf57419a5098cfd502035d16d123ae62 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Mon, 7 Aug 2023 16:22:09 +0200 Subject: [PATCH] [EDF27859] : In salome test mechanism : explicit python executable. --- src/ICoCo/Swig/CTestTestfileInstall.cmake | 2 +- src/MEDCoupling_Swig/CTestTestfileInstall.cmake | 2 +- src/MEDLoader/Swig/CTestTestfileInstall.cmake | 2 +- src/MEDLoader/Test/CTestTestfileInstall.cmake | 2 +- src/MEDPartitioner/Test/CTestTestfileInstall.cmake | 2 +- src/MEDPartitioner_Swig/CTestTestfileInstall.cmake | 2 +- src/PyWrapping/CTestTestfileInstall.cmake | 2 +- src/RENUMBER_Swig/CTestTestfileInstall.cmake | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ICoCo/Swig/CTestTestfileInstall.cmake b/src/ICoCo/Swig/CTestTestfileInstall.cmake index 45e4db161..e915d1a9f 100644 --- a/src/ICoCo/Swig/CTestTestfileInstall.cmake +++ b/src/ICoCo/Swig/CTestTestfileInstall.cmake @@ -22,7 +22,7 @@ INCLUDE(tests.set) FOREACH(tfile ${ALL_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME}) - ADD_TEST(${TEST_NAME} python ${tfile}) + ADD_TEST(${TEST_NAME} python3 ${tfile}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} diff --git a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake index 45e4db161..e915d1a9f 100644 --- a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake +++ b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake @@ -22,7 +22,7 @@ INCLUDE(tests.set) FOREACH(tfile ${ALL_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME}) - ADD_TEST(${TEST_NAME} python ${tfile}) + ADD_TEST(${TEST_NAME} python3 ${tfile}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} diff --git a/src/MEDLoader/Swig/CTestTestfileInstall.cmake b/src/MEDLoader/Swig/CTestTestfileInstall.cmake index 45e4db161..e915d1a9f 100644 --- a/src/MEDLoader/Swig/CTestTestfileInstall.cmake +++ b/src/MEDLoader/Swig/CTestTestfileInstall.cmake @@ -22,7 +22,7 @@ INCLUDE(tests.set) FOREACH(tfile ${ALL_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME}) - ADD_TEST(${TEST_NAME} python ${tfile}) + ADD_TEST(${TEST_NAME} python3 ${tfile}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} diff --git a/src/MEDLoader/Test/CTestTestfileInstall.cmake b/src/MEDLoader/Test/CTestTestfileInstall.cmake index fae1c531e..23ecd4a72 100644 --- a/src/MEDLoader/Test/CTestTestfileInstall.cmake +++ b/src/MEDLoader/Test/CTestTestfileInstall.cmake @@ -23,7 +23,7 @@ SET(TEST_NAMES FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_${tfile}) - ADD_TEST(${TEST_NAME} python MCTestLauncher.py ${tfile}) + ADD_TEST(${TEST_NAME} python3 MCTestLauncher.py ${tfile}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} diff --git a/src/MEDPartitioner/Test/CTestTestfileInstall.cmake b/src/MEDPartitioner/Test/CTestTestfileInstall.cmake index e514f69b8..53c3eb31d 100644 --- a/src/MEDPartitioner/Test/CTestTestfileInstall.cmake +++ b/src/MEDPartitioner/Test/CTestTestfileInstall.cmake @@ -23,7 +23,7 @@ SET(TEST_NAMES FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_${tfile}) - ADD_TEST(${TEST_NAME} python ../MEDLoader/MCTestLauncher.py ${tfile}) + ADD_TEST(${TEST_NAME} python3 ../MEDLoader/MCTestLauncher.py ${tfile}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} diff --git a/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake b/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake index a457eec59..d361cfbb8 100644 --- a/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake +++ b/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake @@ -25,7 +25,7 @@ SET(PYTHONPATH $ENV{PYTHONPATH}) CMAKE_PATH(APPEND PYTHONPATH "../../bin") FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_${tfile}) - ADD_TEST(${TEST_NAME} python ${tfile}.py) + ADD_TEST(${TEST_NAME} python3 ${tfile}.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} diff --git a/src/PyWrapping/CTestTestfileInstall.cmake b/src/PyWrapping/CTestTestfileInstall.cmake index 26554b9d1..ee85aa918 100644 --- a/src/PyWrapping/CTestTestfileInstall.cmake +++ b/src/PyWrapping/CTestTestfileInstall.cmake @@ -22,6 +22,6 @@ INCLUDE(tests.set) FOREACH(tfile ${BASE_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME}) - ADD_TEST(${TEST_NAME} python ${tfile}) + ADD_TEST(${TEST_NAME} python3 ${tfile}) SET_TESTS_PROPERTIES( ${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} ) ENDFOREACH() diff --git a/src/RENUMBER_Swig/CTestTestfileInstall.cmake b/src/RENUMBER_Swig/CTestTestfileInstall.cmake index 97606733e..6738723f9 100644 --- a/src/RENUMBER_Swig/CTestTestfileInstall.cmake +++ b/src/RENUMBER_Swig/CTestTestfileInstall.cmake @@ -25,7 +25,7 @@ SET(PYTHONPATH $ENV{PYTHONPATH}) CMAKE_PATH(APPEND PYTHONPATH "../../bin") FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_${tfile}) - ADD_TEST(${TEST_NAME} python ${tfile}.py) + ADD_TEST(${TEST_NAME} python3 ${tfile}.py) SET(TEST_ENVIRONMENT) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" @@ -35,7 +35,7 @@ FOREACH(tfile ${TEST_NAMES}) ENDFOREACH() SET(TEST_NAME ${COMPONENT_NAME}_RENUMBER_Swig_MEDRenumberUserGuide) -ADD_TEST(${TEST_NAME} python UsersGuideExamplesTest.py) +ADD_TEST(${TEST_NAME} python3 UsersGuideExamplesTest.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} -- 2.39.2