X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fst-client%2Frun_all.sh;h=58a68bf85b71a5c3f9bd7a127f4737f8d4f7da32;hb=43e1ef25edd9bd4d3de10f24ffc6a8381b3f1f73;hp=ab95c737fdcf8aaaf378de71997784973c59230b;hpb=1ac015cbbcd331edc3c14de26290d669d91e4e53;p=anna.git

diff --git a/example/diameter/launcher/deployments/st-client/run_all.sh b/example/diameter/launcher/deployments/st-client/run_all.sh
index ab95c73..58a68bf 100755
--- a/example/diameter/launcher/deployments/st-client/run_all.sh
+++ b/example/diameter/launcher/deployments/st-client/run_all.sh
@@ -1,34 +1,49 @@
 #!/bin/bash
+target=$1
+[ -z "$target" ] && target=ADMLS
+
 cd `dirname $0`
-if [ ! -d "ADMLS" ]
+if [ ! -d $target ]
 then
   echo
-  echo "Run './configure.sh' first !"
+  echo "Directory '$target' missing. Run './configure.sh' first !"
+  echo "(remember that you could provide another target as argument)"
   echo
   exit 1
 fi
 
-for run in `ls ADMLS/*/run.sh`
+for run in `ls $target/*/run.sh`
 do
   cd `dirname $run`
-  ./run.sh
-  #sleep 0.1
+  instance_name=$(basename $PWD)
+  pkill -9 $instance_name
+  [ $? -eq 0 ] && echo -n "Re-" 
+  echo "Starting $instance_name ..."
+  ./run.sh > /dev/null &
   cd - >/dev/null
 done
-
-sleep 1
-echo
-echo
-echo "To enable reports dump for failed tests, execute:"
-echo "   ./operation.sh \"test|report|failed\""
 echo
-echo "To stop the processes, you could execute:"
-echo "   pgrep ADML-[0-9] | xargs kill"
-echo
-echo "When running, use script 'program.sh' to configure the test cases."
-echo "To program again, you should execute './configure.sh' script to"
-echo " change the current testing setup."
-echo
-echo "Done!"
+wait $(jobs -p)
+
+sleep 3
+./checkStatus.sh
+
+cat << EOF
+
+
+
+     To stop the processes, you could execute: pgrep ADML-[0-9] | xargs kill
+     Anyway, executing './run.sh' again you will restart the ADML instances.
+
+     Now it's time to './program.sh' the started instances with the desired
+     scenary. There are two programming variants:
+
+          ./program.sh <test stuff directory>
+          ./program.sh dynamic
+
+
+     Done!
+EOF
+
 echo