From b2f85975d7bff9ff2631c27b8036c4fc774a9c3c Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 2 Mar 2016 17:48:15 +0100 Subject: [PATCH] porting due to KERNEL ac393028ba1a7 --- src/yacsloader/Test/YacsLoaderTest.sh.in | 6 +++--- src/yacsloader/pmml/PmmlExeTest.sh.in | 6 +++--- src/yacsloader_swig/Test/YacsLoaderTest.sh.in | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/yacsloader/Test/YacsLoaderTest.sh.in b/src/yacsloader/Test/YacsLoaderTest.sh.in index 749a1b0a2..f393181d8 100755 --- a/src/yacsloader/Test/YacsLoaderTest.sh.in +++ b/src/yacsloader/Test/YacsLoaderTest.sh.in @@ -49,7 +49,7 @@ EOF # --- launch in background a SALOME session (servers) ln -fs @CMAKE_SOURCE_DIR@/src/yacsloader/samples . - ./runAppli > log1 2>&1 + ./salome > log1 2>&1 & # --- wait a little to let the background process define # the CORBA naming service port and host @@ -59,13 +59,13 @@ EOF # --- execute the test script in SALOME session environment chmod +x @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh - ./runSession @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh + ./salome shell @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh ret=$? # --------------------------------------------------------------------------- kill -9 `cat "/tmp/YACSTEST_PidEcho"` - ./runSession killSalome.py + ./salome shell python killSalome.py echo "exec status YacsLoaderInSessionTest.sh " $ret diff --git a/src/yacsloader/pmml/PmmlExeTest.sh.in b/src/yacsloader/pmml/PmmlExeTest.sh.in index 09442b226..46628f7a4 100755 --- a/src/yacsloader/pmml/PmmlExeTest.sh.in +++ b/src/yacsloader/pmml/PmmlExeTest.sh.in @@ -49,7 +49,7 @@ EOF # --- launch in background a SALOME session (servers) ln -fs @CMAKE_SOURCE_DIR@/src/yacsloader/samples . - ./runAppli > log1 2>&1 + ./salome > log1 2>&1 & # --- wait a little to let the background process define # the CORBA naming service port and host @@ -59,13 +59,13 @@ EOF # --- execute the test script in SALOME session environment chmod +x @CMAKE_CURRENT_BINARY_DIR@/PmmlInSessionTest.sh - ./runSession @CMAKE_CURRENT_BINARY_DIR@/PmmlInSessionTest.sh + ./salome shell @CMAKE_CURRENT_BINARY_DIR@/PmmlInSessionTest.sh ret=$? # --------------------------------------------------------------------------- kill -9 `cat "/tmp/YACSTEST_PidEcho"` - ./runSession killSalome.py + ./salome shell python killSalome.py echo "exec status PmmlInSessionTest.sh " $ret diff --git a/src/yacsloader_swig/Test/YacsLoaderTest.sh.in b/src/yacsloader_swig/Test/YacsLoaderTest.sh.in index e2517197f..f02137d0e 100755 --- a/src/yacsloader_swig/Test/YacsLoaderTest.sh.in +++ b/src/yacsloader_swig/Test/YacsLoaderTest.sh.in @@ -46,7 +46,7 @@ EOF # --- launch in background a SALOME session (servers) ln -fs @CMAKE_SOURCE_DIR@/src/yacsloader/samples . - ./runAppli > log1 2>&1 + ./salome > log1 2>&1 & # --- wait a little to let the background process define # the CORBA naming service port and host @@ -56,13 +56,13 @@ EOF # --- execute the test script in SALOME session environment chmod +x @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh - ./runSession @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh + ./salome shell @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh ret=$? # --------------------------------------------------------------------------- kill -9 `cat "/tmp/YACSTEST_PidEcho"` - ./runSession killSalome.py + ./salome shell python killSalome.py echo "exec status YacsLoaderInSessionTest.sh " $ret -- 2.30.2