From 3f2b6b116496bfb1240e50bcbb471d2d62b8f4aa Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Thu, 2 Apr 2020 15:20:47 +0200 Subject: [PATCH] Fix salome test when both py2 & py3 are available. --- bin/appliskel/tests/concurrentSession/CMakeLists.txt | 2 +- .../tests/concurrentSession/CTestTestfileInstall.cmake | 2 +- bin/appliskel/tests/salomeCommand/CMakeLists.txt | 2 +- bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake | 2 +- bin/appliskel/tests/salomeInstance/CMakeLists.txt | 2 +- bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake | 2 +- bin/appliskel/tests/salomeTest/CMakeLists.txt | 2 +- bin/appliskel/tests/salomeTest/salome_test_in_shell.sh | 2 +- src/KernelHelpers/Test/CTestTestfileInstall.cmake | 2 +- src/Launcher/Test/CTestTestfileInstall.cmake | 4 ++-- src/Launcher/Test/test_stress.sh | 2 +- src/Launcher_SWIG/Test/CMakeLists.txt | 2 +- src/Launcher_SWIG/Test/CTestTestfileInstall.cmake | 2 +- src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake | 2 +- src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake | 4 ++-- src/NamingService/Test/CTestTestfileInstall.cmake | 2 +- src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake | 2 +- src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake | 2 +- src/SALOMESDS/CTestTestfileInstall.cmake | 2 +- src/SALOMETraceCollector/Test/CMakeLists.txt | 4 ++-- src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake | 2 +- src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py | 1 + src/UnitTests/CMakeLists.txt | 4 ++-- src/UnitTests/CTestTestfileInstall.cmake | 2 +- src/UnitTests/UnitTests.py | 1 + src/Utils/Test/CTestTestfileInstall.cmake | 2 +- 26 files changed, 30 insertions(+), 28 deletions(-) diff --git a/bin/appliskel/tests/concurrentSession/CMakeLists.txt b/bin/appliskel/tests/concurrentSession/CMakeLists.txt index e1384c30f..a6193370b 100644 --- a/bin/appliskel/tests/concurrentSession/CMakeLists.txt +++ b/bin/appliskel/tests/concurrentSession/CMakeLists.txt @@ -27,5 +27,5 @@ INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${KERNEL_TEST_DIR}/concurrentSession RENAME CTestTestfile.cmake) -INSTALL(FILES ${scripts} +INSTALL(PROGRAMS ${scripts} DESTINATION ${KERNEL_TEST_DIR}/concurrentSession) diff --git a/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake b/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake index dbf137c9a..f444b288c 100644 --- a/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake +++ b/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake @@ -24,6 +24,6 @@ SET(TEST_NAMES FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_SALOME_CONCURRENT_${tfile}) - ADD_TEST(${TEST_NAME} python ${tfile}.py) + ADD_TEST(${TEST_NAME} ${tfile}.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT}) ENDFOREACH() diff --git a/bin/appliskel/tests/salomeCommand/CMakeLists.txt b/bin/appliskel/tests/salomeCommand/CMakeLists.txt index 86d681dda..8a7a13b92 100644 --- a/bin/appliskel/tests/salomeCommand/CMakeLists.txt +++ b/bin/appliskel/tests/salomeCommand/CMakeLists.txt @@ -24,5 +24,5 @@ INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${KERNEL_TEST_DIR}/salomeCommand RENAME CTestTestfile.cmake) -INSTALL(FILES ${scripts} +INSTALL(PROGRAMS ${scripts} DESTINATION ${KERNEL_TEST_DIR}/salomeCommand) diff --git a/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake b/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake index 1521b7cec..05ab4d56c 100644 --- a/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake +++ b/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake @@ -24,6 +24,6 @@ SET(TEST_NAMES FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_SALOME_COMMAND_${tfile}) - ADD_TEST(${TEST_NAME} python ${tfile}.py) + ADD_TEST(${TEST_NAME} ${tfile}.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT}) ENDFOREACH() diff --git a/bin/appliskel/tests/salomeInstance/CMakeLists.txt b/bin/appliskel/tests/salomeInstance/CMakeLists.txt index 49266a318..44ccf86d3 100644 --- a/bin/appliskel/tests/salomeInstance/CMakeLists.txt +++ b/bin/appliskel/tests/salomeInstance/CMakeLists.txt @@ -26,5 +26,5 @@ INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${KERNEL_TEST_DIR}/salomeInstance RENAME CTestTestfile.cmake) -INSTALL(FILES ${scripts} +INSTALL(PROGRAMS ${scripts} DESTINATION ${KERNEL_TEST_DIR}/salomeInstance) diff --git a/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake b/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake index bc227ddb4..3f217c536 100644 --- a/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake +++ b/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake @@ -21,6 +21,6 @@ SET(TEST_NAMES instances) FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_SALOME_INSTANCE_${tfile}) - ADD_TEST(${TEST_NAME} python ${tfile}.py) + ADD_TEST(${TEST_NAME} ${tfile}.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT}) ENDFOREACH() diff --git a/bin/appliskel/tests/salomeTest/CMakeLists.txt b/bin/appliskel/tests/salomeTest/CMakeLists.txt index f0b512402..c8d1ac59e 100644 --- a/bin/appliskel/tests/salomeTest/CMakeLists.txt +++ b/bin/appliskel/tests/salomeTest/CMakeLists.txt @@ -27,5 +27,5 @@ INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${KERNEL_TEST_DIR}/salomeTest RENAME CTestTestfile.cmake) -INSTALL(FILES ${scripts} +INSTALL(PROGRAMS ${scripts} DESTINATION ${KERNEL_TEST_DIR}/salomeTest) diff --git a/bin/appliskel/tests/salomeTest/salome_test_in_shell.sh b/bin/appliskel/tests/salomeTest/salome_test_in_shell.sh index debc3f436..b6a412c24 100755 --- a/bin/appliskel/tests/salomeTest/salome_test_in_shell.sh +++ b/bin/appliskel/tests/salomeTest/salome_test_in_shell.sh @@ -25,4 +25,4 @@ while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done CALLDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" echo ABSOLUTE_APPLI_PATH: $ABSOLUTE_APPLI_PATH -$ABSOLUTE_APPLI_PATH/salome shell -- python ${CALLDIR}/salome_test.py +$ABSOLUTE_APPLI_PATH/salome shell -- python3 ${CALLDIR}/salome_test.py diff --git a/src/KernelHelpers/Test/CTestTestfileInstall.cmake b/src/KernelHelpers/Test/CTestTestfileInstall.cmake index 1c0e7a511..3545d704f 100644 --- a/src/KernelHelpers/Test/CTestTestfileInstall.cmake +++ b/src/KernelHelpers/Test/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_KernelHelpers) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestKernelHelpers.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestKernelHelpers.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}" diff --git a/src/Launcher/Test/CTestTestfileInstall.cmake b/src/Launcher/Test/CTestTestfileInstall.cmake index eb64b2836..5e6f9546e 100644 --- a/src/Launcher/Test/CTestTestfileInstall.cmake +++ b/src/Launcher/Test/CTestTestfileInstall.cmake @@ -19,13 +19,13 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_Launcher) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} 2000 test_launcher.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} 2000 test_launcher.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" # TIMEOUT 500 ) SET(TEST_NAME ${COMPONENT_NAME}_StressLauncher) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} 2000 ./test_stress.sh) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} 2000 ./test_stress.sh) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" # TIMEOUT 500 ) diff --git a/src/Launcher/Test/test_stress.sh b/src/Launcher/Test/test_stress.sh index 0bb53bc68..2853ff5d4 100755 --- a/src/Launcher/Test/test_stress.sh +++ b/src/Launcher/Test/test_stress.sh @@ -25,7 +25,7 @@ chmod 755 $WORKDIR/command.sh pid_launcher='' for i in {1..500} do - python launcher_use_case.py $WORKDIR 2> $WORKDIR/log$i.err & + ./launcher_use_case.py $WORKDIR 2> $WORKDIR/log$i.err & pid_launcher=$pid_launcher" "$! done exit_code=0 diff --git a/src/Launcher_SWIG/Test/CMakeLists.txt b/src/Launcher_SWIG/Test/CMakeLists.txt index 3739e412a..b4b812199 100644 --- a/src/Launcher_SWIG/Test/CMakeLists.txt +++ b/src/Launcher_SWIG/Test/CMakeLists.txt @@ -27,7 +27,7 @@ IF(NOT WIN32) # ${CMAKE_CURRENT_SOURCE_DIR}/test_launcher.py # -d KERNEL_ROOT_DIR=${CMAKE_INSTALL_PREFIX} # ) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/test_swig_launcher.py + INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/test_swig_launcher.py DESTINATION ${KERNEL_TEST_DIR}/Launcher_SWIG) INSTALL(FILES CTestTestfileInstall.cmake diff --git a/src/Launcher_SWIG/Test/CTestTestfileInstall.cmake b/src/Launcher_SWIG/Test/CTestTestfileInstall.cmake index b4b2d1821..53a047e48 100644 --- a/src/Launcher_SWIG/Test/CTestTestfileInstall.cmake +++ b/src/Launcher_SWIG/Test/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_Launcher_SWIG) - ADD_TEST(${TEST_NAME} python test_swig_launcher.py) + ADD_TEST(${TEST_NAME} test_swig_launcher.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" # TIMEOUT 500 ) diff --git a/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake b/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake index 3c3f83384..67a718d4d 100644 --- a/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake +++ b/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_LifeCycleCORBA) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestLifeCycleCORBA.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestLifeCycleCORBA.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}" diff --git a/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake b/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake index 6e9731097..7e2aee3c4 100644 --- a/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake +++ b/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake @@ -26,14 +26,14 @@ SET(TEST_NAMES IF(NOT WIN32) FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_LC_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ) ENDFOREACH() # resource manager test needs specific CatalogResources file in test directory SET(TEST_NAME ${COMPONENT_NAME}_LC_testresourcemanager) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} testresourcemanager.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} testresourcemanager.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "USER_CATALOG_RESOURCES_FILE=CatalogResources_resource.xml" ) diff --git a/src/NamingService/Test/CTestTestfileInstall.cmake b/src/NamingService/Test/CTestTestfileInstall.cmake index 9496f4b67..7a0d306f9 100644 --- a/src/NamingService/Test/CTestTestfileInstall.cmake +++ b/src/NamingService/Test/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_NamingService) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestNamingService.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestNamingService.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}" diff --git a/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake b/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake index 5c1581a8a..01b0d231b 100644 --- a/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake +++ b/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_SALOMEDSImpl) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDSImpl.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDSImpl.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}" diff --git a/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake b/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake index 9e6a86562..ddee7544f 100644 --- a/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake +++ b/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_LocalTrace) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMELocalTrace.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMELocalTrace.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}" diff --git a/src/SALOMESDS/CTestTestfileInstall.cmake b/src/SALOMESDS/CTestTestfileInstall.cmake index ea15d9426..c83c58485 100644 --- a/src/SALOMESDS/CTestTestfileInstall.cmake +++ b/src/SALOMESDS/CTestTestfileInstall.cmake @@ -19,6 +19,6 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_SalomeSDS) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSalomeSDS.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSalomeSDS.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "PYTHONPATH=${KERNEL_TEST_LIB}:$ENV{PYTHONPATH}") ENDIF(NOT WIN32) diff --git a/src/SALOMETraceCollector/Test/CMakeLists.txt b/src/SALOMETraceCollector/Test/CMakeLists.txt index 582099561..fff7edeb6 100644 --- a/src/SALOMETraceCollector/Test/CMakeLists.txt +++ b/src/SALOMETraceCollector/Test/CMakeLists.txt @@ -48,11 +48,11 @@ TARGET_LINK_LIBRARIES(TestSALOMETraceCollector SALOMETraceCollectorTest ${COMMON INSTALL(TARGETS TestSALOMETraceCollector DESTINATION ${LOCAL_TEST_DIR}) # Executable scripts to be installed -INSTALL(FILES TestSALOMETraceCollector.py DESTINATION ${LOCAL_TEST_DIR}) +INSTALL(PROGRAMS TestSALOMETraceCollector.py DESTINATION ${LOCAL_TEST_DIR}) FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${LOCAL_TEST_DIR}) INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${LOCAL_TEST_DIR} - RENAME CTestTestfile.cmake) \ No newline at end of file + RENAME CTestTestfile.cmake) diff --git a/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake b/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake index 4a67db93b..9ea5e01ee 100644 --- a/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake +++ b/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_SALOMETraceCollector) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMETraceCollector.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMETraceCollector.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}" diff --git a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py index 8bc9cce04..69cfe469a 100644 --- a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py +++ b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py @@ -1,3 +1,4 @@ +#! /usr/bin/env python3 # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/UnitTests/CMakeLists.txt b/src/UnitTests/CMakeLists.txt index f3cd141f6..c4fa5c98d 100644 --- a/src/UnitTests/CMakeLists.txt +++ b/src/UnitTests/CMakeLists.txt @@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES( # Executable scripts to be installed SET(LOCAL_TEST_DIR ${KERNEL_TEST_DIR}/UnitTests) -INSTALL(FILES UnitTests.py DESTINATION ${LOCAL_TEST_DIR}) +INSTALL(PROGRAMS UnitTests.py DESTINATION ${LOCAL_TEST_DIR}) # =============================================================== # Executables targets @@ -98,4 +98,4 @@ INSTALL(TARGETS UnitTests DESTINATION ${LOCAL_TEST_DIR}) INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${LOCAL_TEST_DIR} - RENAME CTestTestfile.cmake) \ No newline at end of file + RENAME CTestTestfile.cmake) diff --git a/src/UnitTests/CTestTestfileInstall.cmake b/src/UnitTests/CTestTestfileInstall.cmake index ff77f2d80..823ecf259 100644 --- a/src/UnitTests/CTestTestfileInstall.cmake +++ b/src/UnitTests/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_UnitTests) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} UnitTests.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} UnitTests.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}" diff --git a/src/UnitTests/UnitTests.py b/src/UnitTests/UnitTests.py index 58c2ae01c..57bc87cf5 100644 --- a/src/UnitTests/UnitTests.py +++ b/src/UnitTests/UnitTests.py @@ -1,3 +1,4 @@ +#! /usr/bin/env python3 # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/Utils/Test/CTestTestfileInstall.cmake b/src/Utils/Test/CTestTestfileInstall.cmake index bb065cb20..36c676d47 100644 --- a/src/Utils/Test/CTestTestfileInstall.cmake +++ b/src/Utils/Test/CTestTestfileInstall.cmake @@ -19,7 +19,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_Utils) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestUtils.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestUtils.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}" -- 2.30.2