From b3d8bbdab78ac57d77c6bb3de114a03bf0b81c41 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Aguerre?= <cedric.aguerre@edf.fr>
Date: Thu, 21 Sep 2017 17:44:46 +0200
Subject: [PATCH] Fix merge_gdd_env_modules (commit 97b8a5)

---
 bin/appliskel/tests/salomeTest/CTestTestfileInstall.cmake | 2 +-
 bin/runSession.py                                         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/appliskel/tests/salomeTest/CTestTestfileInstall.cmake b/bin/appliskel/tests/salomeTest/CTestTestfileInstall.cmake
index c4df885bb..83313b220 100644
--- 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 761e5d023..4b3374eb8 100644
--- 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:
-- 
2.39.2