Fix merge_gdd_env_modules (commit 97b8a5)

diff --git a/bin/appliskel/tests/salomeTest/CTestTestfileInstall.cmake b/bin/appliskel/tests/salomeTest/CTestTestfileInstall.cmake
index c4df885bbc177f4458d58c93a3a83de660f630be..83313b2207356042caf41263986aab1dafd1e077 100644 (file)
--- a/bin/appliskel/tests/salomeTest/CTestTestfileInstall.cmake
+++ b/bin/appliskel/tests/salomeTest/CTestTestfileInstall.cmake
@@ -25,7 +25,7 @@ SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT
 
 SET(TEST_NAME ${COMPONENT_NAME}_SALOME_TEST_${tname}_shell)
 ADD_TEST(${TEST_NAME} bash ${tname}_in_shell.sh)
-SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} WILL_FAIL ON)
+SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 
 SET(TEST_NAME ${COMPONENT_NAME}_SALOME_TEST_${tname}_py)
 ADD_TEST(${TEST_NAME} python ${tname}.py)

diff --git a/bin/runSession.py b/bin/runSession.py
index 761e5d023ed24e32805a47f4f7d04da6b224eee0..4b3374eb8fb4919441f45e27646a615668a18dca 100644 (file)
--- a/bin/runSession.py
+++ b/bin/runSession.py
@@ -213,7 +213,8 @@ def __runLocalSession(command):
           sys.stdout.write("".join(outmsg))
         if errmsg:
           sys.stderr.write("".join(errmsg))
-        sys.exit(1)
+        #sys.exit(1)
+        return 1
 
     return 0
   else: