Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #1865 : support while part type in the result of the field
[modules/shaper.git]
/
salome_run.sh
diff --git
a/salome_run.sh
b/salome_run.sh
index ae238852a7c7cc8560662d2eafd431675fc57dbe..dcbb707ceb93079b9d4aaabce511c874d0bc2731 100755
(executable)
--- a/
salome_run.sh
+++ b/
salome_run.sh
@@
-1,20
+1,27
@@
-#!/bin/bash
-e
+#!/bin/bash
-a_dir=$(dirname $0)
+source env.sh
-if [ "$#" = 1 ]; then
- export SALOME_PORT="$1"
-elif [ -z ${SALOME_PORT} ]; then
- export SALOME_PORT=2900
-fi
+${TOOLS_DIR}/solver.sh "$@"
-echo "Run SALOME on port ${SALOME_PORT}"
+# 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
-source ${a_dir}/env.sh
-source ${a_dir}/env_salome.sh
+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"
-
set -x +
e
+
${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalom
e
-${a_dir}/salome_kill.sh
+#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/runSalome.py --port=${SALOME_PORT} -r ./test.squish/shared/testdata/SalomeApp.xml 2>&1 >/dev/null