Make stable SALOME tests run

diff --git a/env_linux.sh b/env_linux.sh
index 69ff2a646fdc39c9af54db1fbd94038587a04847..0c881304341723d07dbd46db8b7ac38e7cb87cc4 100644 (file)
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
 
-set +x
 set +u
 echo "Export SALOME from ${INST_ROOT}..."
 source ${INST_ROOT}/env_products.sh
 set -u
-set -x
 
 #------ SolveSpace ------
 export SOLVESPACE_ROOT_DIR=${NEWGEOM_PDIR}/solvespace-2.0

diff --git a/env_salome.sh b/env_salome.sh
index 4343cd5efafa7b25270e289ea07d993d22422fcf..eea2eca66b8190d04b8310cdf9f8c25bbe2642c8 100644 (file)
--- a/env_salome.sh
+++ b/env_salome.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-pushd ${SOURCES_DIR}
-  source env_linux.sh
-popd
+a_dir=$(dirname $0)
+
+source ${a_dir}/env_linux.sh
 
 # Correcting path which defined with error
 export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}

diff --git a/env_standalone.sh b/env_standalone.sh
index a226bcfc67e17ba912dc568f57e9f9e210532779..6be641c77915e288c53950b4feb38f87dc068ea1 100644 (file)
--- a/env_standalone.sh
+++ b/env_standalone.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-pushd ${SOURCES_DIR}
-  source env_linux.sh
-popd
+a_dir=$(dirname $0)
+
+source ${a_dir}/env_linux.sh
 
 export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
 export LightAppConfig=${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui

diff --git a/linux_run.sh b/linux_run.sh
index daff08a03cd36559bb23e12a8301c8c70e82c738..1e60be570715ab7cc7a9c2207650b7581c59a696 100755 (executable)
--- a/linux_run.sh
+++ b/linux_run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-cd $(dirname $0)
+a_dir=$(dirname $0)
 
-source env.sh
-source env_standalone.sh
+source ${a_dir}/env.sh
+source ${a_dir}/env_standalone.sh
 
 ${INSTALL_DIR}/bin/GeomApp "$@"

diff --git a/salome_kill.sh b/salome_kill.sh
index 18da44763fdeba42f1b6b8175410aa332cf814ca..3fe6b6f18f57ad2dc99e1f857ea8fdf11471d714 100755 (executable)
--- a/salome_kill.sh
+++ b/salome_kill.sh
@@ -1,11 +1,14 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
-source env.sh
-source env_salome.sh
+a_dir=$(dirname $0)
+
+source ${a_dir}/env.sh
+source ${a_dir}/env_salome.sh
+
+set +e -x
 
 ${KERNEL_ROOT_DIR}/bin/salome/killSalome.py
-set +e
 killall SALOME_LauncherServer
 killall SALOME_Session_Server
 killall SALOME_ConnectionManagerServer
-set -e
+killall omniNames

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

diff --git a/test_squish.sh b/test_squish.sh
index 6afa70b786d5c25175fff1e92b56007c390d2581..d2fe367ecad818933874de829b0b027781585e15 100755 (executable)
--- a/test_squish.sh
+++ b/test_squish.sh
@@ -15,7 +15,7 @@ for aut in linux_run.sh salome_run.sh; do
 done
 squishserver --config setAUTTimeout 60
 squishserver --verbose --port=${SQUISHSERVER_PORT} --stop
-squishserver --verbose --port=${SQUISHSERVER_PORT} --daemon
+squishserver --verbose --port=${SQUISHSERVER_PORT} 2>server.err &
 
 RETVAL=0
 for suite in ./test.squish/suite_*