Fixes for run examples.

diff --git a/Examples/calcium1/build.sh b/Examples/calcium1/build.sh
index 12c3ac0d166c38a9bb81618e055bdb4b0e9652e3..f0eb4f5f152cc0a595eee38d79b183c54ae50b0f 100755 (executable)
--- a/Examples/calcium1/build.sh
+++ b/Examples/calcium1/build.sh
@@ -1,6 +1,7 @@
-source ../exec.sh
-make
-python components.py
+../exec.sh make
+../exec.sh python components.py
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
+appli/salome killall

diff --git a/Examples/calcium2/build.sh b/Examples/calcium2/build.sh
index 48734135cc93e5debda9116a54e2401a0185f947..f0eb4f5f152cc0a595eee38d79b183c54ae50b0f 100755 (executable)
--- a/Examples/calcium2/build.sh
+++ b/Examples/calcium2/build.sh
@@ -1,7 +1,7 @@
-source ../exec.sh
-make
-python components.py
+../exec.sh make
+../exec.sh python components.py
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/cpp1/build.sh b/Examples/cpp1/build.sh
index e8aa57aed5dd5c3bce41cc24c5cf4bd24fc4ef0d..b3393d20d26fd072e793eb12fdcad7492cba8a35 100755 (executable)
--- a/Examples/cpp1/build.sh
+++ b/Examples/cpp1/build.sh
@@ -1,5 +1,6 @@
 ../exec.sh python components.py
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/cpp2/build.sh b/Examples/cpp2/build.sh
index a79134482870e8b21da0be405abc3e6c004f2c03..fb9970b4ad131f8a6ece48c92f17b336dd7b27ef 100755 (executable)
--- a/Examples/cpp2/build.sh
+++ b/Examples/cpp2/build.sh
@@ -1,7 +1,7 @@
-source ../exec.sh
-python components.py
-make
+../exec.sh python components.py
+../exec.sh make
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/fort1/build.sh b/Examples/fort1/build.sh
index 48734135cc93e5debda9116a54e2401a0185f947..f0eb4f5f152cc0a595eee38d79b183c54ae50b0f 100755 (executable)
--- a/Examples/fort1/build.sh
+++ b/Examples/fort1/build.sh
@@ -1,7 +1,7 @@
-source ../exec.sh
-make
-python components.py
+../exec.sh make
+../exec.sh python components.py
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/fort2/build.sh b/Examples/fort2/build.sh
index a79134482870e8b21da0be405abc3e6c004f2c03..fb9970b4ad131f8a6ece48c92f17b336dd7b27ef 100755 (executable)
--- a/Examples/fort2/build.sh
+++ b/Examples/fort2/build.sh
@@ -1,7 +1,7 @@
-source ../exec.sh
-python components.py
-make
+../exec.sh python components.py
+../exec.sh make
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/mpi1/build.sh b/Examples/mpi1/build.sh
index 34ef8e0da5a6f0385824917f34c64a6b76258c81..1aa6cdc1c8385fa8f3c924438b1f1affddcf104f 100755 (executable)
--- a/Examples/mpi1/build.sh
+++ b/Examples/mpi1/build.sh
@@ -2,5 +2,6 @@
 ../exec.sh python components.py
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/parahxx1/build.sh b/Examples/parahxx1/build.sh
index 5578fe9f939ab8d2c6f3185592fec12738378c03..0feb9de30a33d9d75390f0cda7854f6ad9f9f08d 100755 (executable)
--- a/Examples/parahxx1/build.sh
+++ b/Examples/parahxx1/build.sh
@@ -1,5 +1,6 @@
 ../exec.sh python components.py
 
 # test
+LD_LIBRARY_PATH=`pwd`/../mpi1/mpilib/lib/ appli/salome -t
 LD_LIBRARY_PATH=`pwd`/../mpi1/mpilib/lib/ appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/pyth1/build.sh b/Examples/pyth1/build.sh
index e8aa57aed5dd5c3bce41cc24c5cf4bd24fc4ef0d..b3393d20d26fd072e793eb12fdcad7492cba8a35 100755 (executable)
--- a/Examples/pyth1/build.sh
+++ b/Examples/pyth1/build.sh
@@ -1,5 +1,6 @@
 ../exec.sh python components.py
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/pyth2/build.sh b/Examples/pyth2/build.sh
index e8aa57aed5dd5c3bce41cc24c5cf4bd24fc4ef0d..b3393d20d26fd072e793eb12fdcad7492cba8a35 100755 (executable)
--- a/Examples/pyth2/build.sh
+++ b/Examples/pyth2/build.sh
@@ -1,5 +1,6 @@
 ../exec.sh python components.py
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall

diff --git a/Examples/test_compo.py b/Examples/test_compo.py
index 1349bf505b006a9511c86108d491c72ee6ad5d68..283e678a8f516bd2b173cb27ef88c14aeee7c315 100755 (executable)
--- a/Examples/test_compo.py
+++ b/Examples/test_compo.py
@@ -8,22 +8,9 @@ import os
 import sys
 
 import imp
-appli_dir = "appli"
-sys.path[:0] = [os.path.join(appli_dir, "bin", "salome", "appliskel")]
-salome_module = imp.load_source("SALOME", os.path.join(appli_dir, "salome"))
 
 class TestCompo(unittest.TestCase):
   def setUp(self):
-    #start salome and connect to it
-    try:
-      salome_module.main(["start", "-t"])
-    except SystemExit as e:
-      pass
-    import runSession
-    runSession.configureSession()
-    import setenv
-    setenv.main(True)
-    
     # creat study and load catalogs
     import SALOMERuntime
     SALOMERuntime.RuntimeSALOME_setRuntime()
@@ -52,9 +39,6 @@ class TestCompo(unittest.TestCase):
     self.assertEqual(p.getEffectiveState(), pilot.DONE)
     
   def tearDown(self):
-    try:
-      salome_module.main(["killall"])
-    except SystemExit as e:
       pass
   
 if __name__ == '__main__':

diff --git a/Examples/types1/build.sh b/Examples/types1/build.sh
index e8aa57aed5dd5c3bce41cc24c5cf4bd24fc4ef0d..b3393d20d26fd072e793eb12fdcad7492cba8a35 100755 (executable)
--- a/Examples/types1/build.sh
+++ b/Examples/types1/build.sh
@@ -1,5 +1,6 @@
 ../exec.sh python components.py
 
 # test
+appli/salome -t
 appli/salome shell ../test_compo.py
-
+appli/salome killall