-#!/bin/bash -e
+#!/bin/bash
-a_dir=$(dirname $0)
+source env.sh
-cd ${a_dir}
+${TOOLS_DIR}/solver.sh "$@"
-#if [ "$#" = 1 ]; then
-# export SALOME_PORT="$1"
-#elif [ -z ${SALOME_PORT} ]; then
-# export SALOME_PORT=2900
-#fi
+# kill processes of previous SALOME run
+if [ -f .salomeport ]; then
+ SALOME_PORT=$(cat .salomeport)
+ ${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+ pkill -f "omniNames -start ${SALOME_PORT}"
+ rm .salomeport
+fi
-echo "Run SALOME on port ${SALOME_PORT}"
-
-source ${a_dir}/env.sh
-source ${a_dir}/env_salome.sh
-
-set -x +e
-
-SALOME_ARGS="-r ./test.squish/shared/testdata/SalomeApp.xml"
-#SALOME_ARGS="${SALOME_ARGS} --port=${SALOME_PORT}"
-if [ -f GDB ]; then
- echo "No --gdb-session"
- #SALOME_ARGS="${SALOME_ARGS} --gdb-session"
+SALOME_ARGS=""
+if [[ "${SALOME_SQUISH_PREFS:-FALSE}" == "TRUE" ]]; then
+ SALOME_ARGS="${SALOME_ARGS} -r ${SOURCES_DIR}/test.squish/shared/testdata/SalomeApp.xml"
fi
SALOME_ARGS="${SALOME_ARGS} --ns-port-log=$(pwd)/.salomeport"
-${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} 2>&1 >/dev/null &
-SALOME_PID=$!
-wait ${SALOME_PID}
+${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome
-echo "SALOME_PORT=$(cat $(pwd)/.salomeport)"
+#SALOME_PORT=$(cat .salomeport)
+#echo "Kill SALOME on port ${SALOME_PORT}"
+#${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+#pkill -f "omniNames -start ${SALOME_PORT}"
-${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
