From 25dd2f341e9321183ac482aef2fe8caf6aaa2529 Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Thu, 2 Apr 2020 18:29:43 +0200 Subject: [PATCH] Fix salome test when both py2 & py3 are available. --- src/engine_swig/CMakeLists.txt | 2 +- src/engine_swig/CTestTestfileInstall.cmake | 4 ++-- src/engine_swig/testBase64Conv.py | 1 + src/engine_swig/testPlayGround0.py | 1 + src/pmml/PMMLlib.cxx | 4 ++-- src/pmml/Test/samples/unittest_ref_ann_model.py | 2 +- src/pmml/Test/samples/unittest_ref_lr_model.py | 2 +- src/pmml/pmml_swig/CMakeLists.txt | 2 +- src/pmml/pmml_swig/CTestTestfileInstall.cmake | 2 +- src/pmml/pmml_swig/PMMLBasicsTest.py | 1 + src/py2yacs/Test/CTestTestfileInstall.cmake | 2 +- src/runtime/Test/runtimeTest.cxx | 2 +- src/runtime/Test/xmlrun_orig.sh | 2 +- src/salomeloader/salomeloader.sh | 2 +- src/salomeloader/testSalomeLoader.py.in | 2 +- src/yacsloader/Test/CTestTestfileInstall.cmake | 4 ++-- src/yacsloader/Test/YacsLoaderInSessionTest.sh.in | 2 +- src/yacsloader/Test/YacsLoaderTest.sh.in | 2 +- src/yacsloader/Test/xmlrun_orig.sh | 2 +- src/yacsloader_swig/Test/CMakeLists.txt | 2 +- src/yacsloader_swig/Test/CTestTestfileInstall.cmake | 4 ++-- src/yacsloader_swig/Test/StdAloneYacsLoaderTest1.py | 1 + 22 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt index a748a044d..b9b26e76b 100644 --- a/src/engine_swig/CMakeLists.txt +++ b/src/engine_swig/CMakeLists.txt @@ -145,5 +145,5 @@ ADD_TEST(NAME Base64Conv COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR SET_TESTS_PROPERTIES(Base64Conv PROPERTIES ENVIRONMENT "${tests_env}") SET(LOCAL_TEST_DIR ${SALOME_YACS_INSTALL_TEST}/engine_swig) SET(LOCAL_TEST_FILES testPlayGround0.py testBase64Conv.py) -INSTALL(FILES ${LOCAL_TEST_FILES} DESTINATION ${LOCAL_TEST_DIR}) +INSTALL(PROGRAMS ${LOCAL_TEST_FILES} DESTINATION ${LOCAL_TEST_DIR}) INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${LOCAL_TEST_DIR} RENAME CTestTestfile.cmake) diff --git a/src/engine_swig/CTestTestfileInstall.cmake b/src/engine_swig/CTestTestfileInstall.cmake index 16e758930..742b4d785 100644 --- a/src/engine_swig/CTestTestfileInstall.cmake +++ b/src/engine_swig/CTestTestfileInstall.cmake @@ -19,9 +19,9 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_PlayGround0) - ADD_TEST(${TEST_NAME} python testPlayGround0.py) + ADD_TEST(${TEST_NAME} testPlayGround0.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") SET(TEST_NAME ${COMPONENT_NAME}_Base64Conv) - ADD_TEST(${TEST_NAME} python testBase64Conv.py) + ADD_TEST(${TEST_NAME} testBase64Conv.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") ENDIF() diff --git a/src/engine_swig/testBase64Conv.py b/src/engine_swig/testBase64Conv.py index 92d2a884f..0a52cf1df 100644 --- a/src/engine_swig/testBase64Conv.py +++ b/src/engine_swig/testBase64Conv.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # Copyright (C) 2019 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or diff --git a/src/engine_swig/testPlayGround0.py b/src/engine_swig/testPlayGround0.py index 88b5fed8b..51fb89f5e 100644 --- a/src/engine_swig/testPlayGround0.py +++ b/src/engine_swig/testPlayGround0.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # Copyright (C) 2006-2019 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or diff --git a/src/pmml/PMMLlib.cxx b/src/pmml/PMMLlib.cxx index e708ca8c9..9f22fa620 100644 --- a/src/pmml/PMMLlib.cxx +++ b/src/pmml/PMMLlib.cxx @@ -2044,7 +2044,7 @@ std::string PMMLlib::ExportNeuralNetworkPyStr(std::string functionName, fillVectorsForExport(nInput,nOutput,nHidden,normType,minInput,maxInput,minOutput,maxOutput,valW); // Shebang et imports - out << "#!/usr/bin/env python" << endl; + out << "#!/usr/bin/env python3" << endl; out << "# -*- coding: utf-8 -*-" << endl; out << endl; out << "from math import tanh, exp" << endl; @@ -2814,7 +2814,7 @@ std::string PMMLlib::ExportLinearRegressionPyStr(std::string functionName, ostringstream out; // Shebang et imports - out << "#!/usr/bin/env python" << endl; + out << "#!/usr/bin/env python3" << endl; out << "# -*- coding: utf-8 -*-" << endl; out << endl; diff --git a/src/pmml/Test/samples/unittest_ref_ann_model.py b/src/pmml/Test/samples/unittest_ref_ann_model.py index 2a1f5e5f8..532ea27eb 100755 --- a/src/pmml/Test/samples/unittest_ref_ann_model.py +++ b/src/pmml/Test/samples/unittest_ref_ann_model.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from math import tanh, exp diff --git a/src/pmml/Test/samples/unittest_ref_lr_model.py b/src/pmml/Test/samples/unittest_ref_lr_model.py index 5dbea2cf4..e241ad410 100755 --- a/src/pmml/Test/samples/unittest_ref_lr_model.py +++ b/src/pmml/Test/samples/unittest_ref_lr_model.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- def myTestFunc(param): diff --git a/src/pmml/pmml_swig/CMakeLists.txt b/src/pmml/pmml_swig/CMakeLists.txt index cbff66f1c..56fb0184f 100644 --- a/src/pmml/pmml_swig/CMakeLists.txt +++ b/src/pmml/pmml_swig/CMakeLists.txt @@ -86,7 +86,7 @@ IF(SALOME_BUILD_TESTS) SET(LOCAL_TEST_FILES PMMLBasicsTest.py ) - INSTALL(FILES ${LOCAL_TEST_FILES} + INSTALL(PROGRAMS ${LOCAL_TEST_FILES} DESTINATION ${LOCAL_TEST_DIR}) ENDIF(SALOME_BUILD_TESTS) diff --git a/src/pmml/pmml_swig/CTestTestfileInstall.cmake b/src/pmml/pmml_swig/CTestTestfileInstall.cmake index 5ab2c341f..c8db9a6a2 100644 --- a/src/pmml/pmml_swig/CTestTestfileInstall.cmake +++ b/src/pmml/pmml_swig/CTestTestfileInstall.cmake @@ -19,6 +19,6 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_YacsPMMLBasicsTest) - ADD_TEST(${TEST_NAME} python PMMLBasicsTest.py) + ADD_TEST(${TEST_NAME} PMMLBasicsTest.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") ENDIF(NOT WIN32) diff --git a/src/pmml/pmml_swig/PMMLBasicsTest.py b/src/pmml/pmml_swig/PMMLBasicsTest.py index e34a1b2fa..2e56ac308 100644 --- a/src/pmml/pmml_swig/PMMLBasicsTest.py +++ b/src/pmml/pmml_swig/PMMLBasicsTest.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Copyright (C) 2007-2019 CEA/DEN, EDF R&D # diff --git a/src/py2yacs/Test/CTestTestfileInstall.cmake b/src/py2yacs/Test/CTestTestfileInstall.cmake index 08edfb781..57767b843 100644 --- a/src/py2yacs/Test/CTestTestfileInstall.cmake +++ b/src/py2yacs/Test/CTestTestfileInstall.cmake @@ -20,7 +20,7 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_Py2YacsTest) # Need a salome session for this test - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./TestPy2yacs) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} ./TestPy2yacs) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ) diff --git a/src/runtime/Test/runtimeTest.cxx b/src/runtime/Test/runtimeTest.cxx index 0e9993d12..04e09a831 100644 --- a/src/runtime/Test/runtimeTest.cxx +++ b/src/runtime/Test/runtimeTest.cxx @@ -48,7 +48,7 @@ #include #include -//#define _DEVDEBUG_ +#define _DEVDEBUG_ #include "YacsTrace.hxx" using namespace YACS::ENGINE; diff --git a/src/runtime/Test/xmlrun_orig.sh b/src/runtime/Test/xmlrun_orig.sh index 60f9a66f6..9180961b7 100755 --- a/src/runtime/Test/xmlrun_orig.sh +++ b/src/runtime/Test/xmlrun_orig.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2006-2019 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or diff --git a/src/salomeloader/salomeloader.sh b/src/salomeloader/salomeloader.sh index fd0123e3e..7ecf60bc9 100755 --- a/src/salomeloader/salomeloader.sh +++ b/src/salomeloader/salomeloader.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2006-2019 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or diff --git a/src/salomeloader/testSalomeLoader.py.in b/src/salomeloader/testSalomeLoader.py.in index 085408df7..ee5310977 100755 --- a/src/salomeloader/testSalomeLoader.py.in +++ b/src/salomeloader/testSalomeLoader.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2006-2019 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or diff --git a/src/yacsloader/Test/CTestTestfileInstall.cmake b/src/yacsloader/Test/CTestTestfileInstall.cmake index 05d6e9945..4ad23b496 100644 --- a/src/yacsloader/Test/CTestTestfileInstall.cmake +++ b/src/yacsloader/Test/CTestTestfileInstall.cmake @@ -19,12 +19,12 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_YacsLoaderTest) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./runYacsLoaderTest.sh) + ADD_TEST(${TEST_NAME} ${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} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./TestYACSPMML) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} ./TestYACSPMML) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") ENDIF() diff --git a/src/yacsloader/Test/YacsLoaderInSessionTest.sh.in b/src/yacsloader/Test/YacsLoaderInSessionTest.sh.in index b6fda9cb1..39bc6b8ac 100755 --- a/src/yacsloader/Test/YacsLoaderInSessionTest.sh.in +++ b/src/yacsloader/Test/YacsLoaderInSessionTest.sh.in @@ -22,7 +22,7 @@ # --- wait until SALOME containers are ready -python @CMAKE_CURRENT_SOURCE_DIR@/waitContainers.py +python3 @CMAKE_CURRENT_SOURCE_DIR@/waitContainers.py # --- launch CORBA server echoSrv for tests diff --git a/src/yacsloader/Test/YacsLoaderTest.sh.in b/src/yacsloader/Test/YacsLoaderTest.sh.in index 0910f9787..bf9b5ce82 100755 --- a/src/yacsloader/Test/YacsLoaderTest.sh.in +++ b/src/yacsloader/Test/YacsLoaderTest.sh.in @@ -65,7 +65,7 @@ EOF # --------------------------------------------------------------------------- kill -9 `cat "/tmp/YACSTEST_PidEcho"` - ./salome shell python killSalome.py + ./salome shell python3 killSalome.py echo "exec status YacsLoaderInSessionTest.sh " $ret diff --git a/src/yacsloader/Test/xmlrun_orig.sh b/src/yacsloader/Test/xmlrun_orig.sh index 032500075..69fdac8c3 100755 --- a/src/yacsloader/Test/xmlrun_orig.sh +++ b/src/yacsloader/Test/xmlrun_orig.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2006-2019 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or diff --git a/src/yacsloader_swig/Test/CMakeLists.txt b/src/yacsloader_swig/Test/CMakeLists.txt index a1ff64355..1a3fbd0f4 100644 --- a/src/yacsloader_swig/Test/CMakeLists.txt +++ b/src/yacsloader_swig/Test/CMakeLists.txt @@ -48,7 +48,7 @@ IF(NOT WIN32) testExecForEachGeoMesh.py async_plugin.py ) - INSTALL(FILES ${LOCAL_TEST_FILES} + INSTALL(PROGRAMS ${LOCAL_TEST_FILES} DESTINATION ${LOCAL_TEST_DIR}) INSTALL(PROGRAMS runUnitTest.sh DESTINATION ${LOCAL_TEST_DIR}) diff --git a/src/yacsloader_swig/Test/CTestTestfileInstall.cmake b/src/yacsloader_swig/Test/CTestTestfileInstall.cmake index 889e22903..ff5955c46 100644 --- a/src/yacsloader_swig/Test/CTestTestfileInstall.cmake +++ b/src/yacsloader_swig/Test/CTestTestfileInstall.cmake @@ -19,13 +19,13 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_YacsLoaderTest_swig) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./runUnitTest.sh) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} ./runUnitTest.sh) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ) SET(TEST_NAME ${COMPONENT_NAME}_StdAloneYacsLoaderTest1) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} python StdAloneYacsLoaderTest1.py) + ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} StdAloneYacsLoaderTest1.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ) diff --git a/src/yacsloader_swig/Test/StdAloneYacsLoaderTest1.py b/src/yacsloader_swig/Test/StdAloneYacsLoaderTest1.py index d5df2d064..aabb90501 100644 --- a/src/yacsloader_swig/Test/StdAloneYacsLoaderTest1.py +++ b/src/yacsloader_swig/Test/StdAloneYacsLoaderTest1.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # Copyright (C) 2006-2019 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or -- 2.30.2