Fix salome test when both py2 & py3 are available.

diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt
index a748a044d969a9e5f5d386418a4c196763bdb436..b9b26e76b17f31e698c3f366e8cbbdf7451d165f 100644 (file)
--- 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 16e758930958211dce261bdac0e2e0e8b2d7f66b..742b4d7857fe8d0ee54fc715d81092e1998460df 100644 (file)
--- 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 92d2a884fae6a97001fb501132fb89e177d5b500..0a52cf1df8f5f1518bf69abeccf19d501ac20d36 100644 (file)
--- 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 88b5fed8b60ebe8c251a69e7eee33cafe110a864..51fb89f5ea02218f105f71c446ffae9a47d0a4c4 100644 (file)
--- 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 e708ca8c980e7b72539947bad651156f21f8acca..9f22fa620d30c96b65c73ef7b23d0d481cbbb452 100644 (file)
--- 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 2a1f5e5f882344a7119d1ff8ab5dc03adf56e3ec..532ea27eb3fd32044488813e0efb2a363a6bbc66 100755 (executable)
--- 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 5dbea2cf43a6058eeefa9561ac542d8aaaa6d3cc..e241ad410ad7fea6a281fbd20fcc72e5d7003731 100755 (executable)
--- 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 cbff66f1c6f2b0d4ed63764dc3f24317c71ce8e8..56fb0184f609a092bcadfba9436ef7702e4187f9 100644 (file)
--- 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 5ab2c341f316e3c6262921053e9538482270b830..c8db9a6a2925b4003faef81a5feac0e3a599d107 100644 (file)
--- 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 e34a1b2fae87831c758909c636a0c263205e0e5a..2e56ac308e26c164c47a8efbfdeb9f082f705c18 100644 (file)
--- 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 08edfb7815844b70387c6329fd52a025eb6b8a06..57767b8438076d78419a8557ec7482768749982d 100644 (file)
--- 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 0e9993d12b1fec405f22dab06ed7cc90bbdb59f0..04e09a831f68bce0c8144ca1df095e1834d90392 100644 (file)
--- a/src/runtime/Test/runtimeTest.cxx
+++ b/src/runtime/Test/runtimeTest.cxx
@@ -48,7 +48,7 @@
 #include <cctype>
 #include <cstdlib>
 
-//#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 60f9a66f6ef5d52fbde005a0a2e7c33ce42c1004..9180961b753e455a947c67ca3d729baa22d2f4d7 100755 (executable)
--- 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 fd0123e3e09aec9f6e966d0be6e5d76917fa4b88..7ecf60bc914d33e7a32b0db9a7211dbd279909e1 100755 (executable)
--- 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 085408df729968bbf93b13fa1493394cdaea06a8..ee53109777f0246b27eb73708d0b449dd44b0381 100755 (executable)
--- 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 05d6e9945fb8218501900c2c918668ee005296f2..4ad23b496272e67360f907867969c37c0e14dd6d 100644 (file)
--- 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 b6fda9cb1f7b13c23d87fcf564bf536081eaf2de..39bc6b8ac6bda121ecc421dd56087baed5af7eef 100755 (executable)
--- 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 0910f9787029fe0b2197606bd906c2a13ee3b344..bf9b5ce82c6d6a81c217d13126c21ddad880f1cd 100755 (executable)
--- 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 0325000752f84b1309bdab3c2f04aa1b1bc31296..69fdac8c3bc0997d0cee09b28879fc4e8380d616 100755 (executable)
--- 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 a1ff643559da085fd51cf68acd23a756a8810300..1a3fbd0f44fb3679860cfb1d452f37d6fc6d0b03 100644 (file)
--- 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 889e22903ee3bfc8dc8fc0d84dac3a01f0bb2cfd..ff5955c46ec0930d869924025fdef21d79276c4d 100644 (file)
--- 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 d5df2d064eebcc3ead89b498a3c15ce0f4f95a0d..aabb905010bf26acad3a1ebeda7693756225018e 100644 (file)
--- 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