Make stable SALOME tests run

[modules/shaper.git] / salome_run.sh

diff --git a/salome_run.sh b/salome_run.sh
index 9844a1a3812f1664ffb087ee0536ca6b7ef6ccc8..ae238852a7c7cc8560662d2eafd431675fc57dbe 100755 (executable)
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -1,6 +1,6 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
-cd $(dirname $0)
+a_dir=$(dirname $0)
 
 if [ "$#" = 1 ]; then
   export SALOME_PORT="$1"
@@ -8,9 +8,13 @@ elif [ -z ${SALOME_PORT} ]; then
   export SALOME_PORT=2900
 fi
 
-source env.sh
-source env_salome.sh
+echo "Run SALOME on port ${SALOME_PORT}"
 
-${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
-${KERNEL_ROOT_DIR}/bin/salome/runSalome.py --port=${SALOME_PORT} -r ./test.squish/shared/testdata/SalomeApp.xml
-${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+source ${a_dir}/env.sh
+source ${a_dir}/env_salome.sh
+
+set -x +e
+
+${a_dir}/salome_kill.sh
+
+${KERNEL_ROOT_DIR}/bin/salome/runSalome.py --port=${SALOME_PORT} -r ./test.squish/shared/testdata/SalomeApp.xml 2>&1 >/dev/null