Fix salome_instance.py called by salome_test_driver.py in order to launch instance...

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index bede2a508af6dfc32e2b416e29d6dc25333850c0..16d8f13c84bb9fee3b8b0006acac4df155759567 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -48,7 +48,6 @@ SET(SCRIPTS
   runSalomeCommon.py
   runSalome.py
   runSalomeOld.py
-  runSalomeSL.py
   runSalomeNoServer.py
   runSession.py
   runConsole.py

diff --git a/bin/addToKillList.py b/bin/addToKillList.py
index 3f892e77283ea9441fb1ef3a4050bd8588eaedbd..e306ccdd9a628eebf25666d50856a960a43a36ae 100755 (executable)
--- a/bin/addToKillList.py
+++ b/bin/addToKillList.py
@@ -120,7 +120,8 @@ def killList(port=None):
             pass
         pass
     # remove processes dictionary file
-    os.remove(filedict)
+    if os.path.exists(filedict):
+        os.remove(filedict)
     pass
 
 if __name__ == "__main__":

diff --git a/bin/appliskel/salome_tester/salome_instance.py b/bin/appliskel/salome_tester/salome_instance.py
index 28e29853fa20823d41bf5a35e73ea074892bc587..df7e432374680e19cf2804190f44b7f3fdf03b04 100755 (executable)
--- a/bin/appliskel/salome_tester/salome_instance.py
+++ b/bin/appliskel/salome_tester/salome_instance.py
@@ -65,7 +65,7 @@ class SalomeInstance:
     if args is None:
       args = []
 
-    sys.argv = ['runSalome'] + args
+    sys.argv = ['runSalomeOld'] + args
 
     if with_gui:
       # :WARNING: NOT TESTED YET
@@ -82,8 +82,8 @@ class SalomeInstance:
 
     import setenv
     setenv.main(True)
-    import runSalome
-    runSalome.runSalome()
+    import runSalomeOld
+    runSalomeOld.runSalome()
 
     if not with_gui:
       import salome

diff --git a/bin/salomeContext.py b/bin/salomeContext.py
index a8eb9dd28a869b88e9221ffde95ad5fc8d68798e..3cc93d22de0da7b7ffd243527eb979a06f31fade 100755 (executable)
--- a/bin/salomeContext.py
+++ b/bin/salomeContext.py
@@ -353,12 +353,12 @@ class SalomeContext:
     if args is None:
       args = []
     # Initialize SALOME environment
-    sys.argv = ['runSalome'] + args
+    sys.argv = ['runSalomeOld'] + args
     import setenv
-    setenv.main(True, exeName="salome start")
+    setenv.main(True, exeName="salome withsession")
 
-    import runSalome
-    runSalome.runSalome()
+    import runSalomeOld
+    runSalomeOld.runSalome()
     return 0
   #