From: Eduardo Ramos Testillano <eduardo.ramos.testillano@ericsson.com>
Date: Thu, 27 Oct 2016 08:25:32 +0000 (+0200)
Subject: fixes
X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=commitdiff_plain;h=bbcfa8f729c674553d0a61e90d84f5d920df2ab5

fixes
---

diff --git a/example/diameter/launcher/deployments/st-client/configure.sh b/example/diameter/launcher/deployments/st-client/configure.sh
index 25646f3..1897ce3 100755
--- a/example/diameter/launcher/deployments/st-client/configure.sh
+++ b/example/diameter/launcher/deployments/st-client/configure.sh
@@ -211,6 +211,8 @@ then
   wanted_repeats=$((wanted_cycles-1))
   echo $wanted_cycles > $CYCLE_REPEATS__ST_CONF_FILE
   [ $wanted_repeats -gt 0 ] && echo "Configured $wanted_repeats cycle repeats ($wanted_cycles cycles x $time_covered seconds ~ $((wanted_cycles*time_covered)) seconds of testing)."
+else
+  echo 0 > $CYCLE_REPEATS__ST_CONF_FILE
 fi
 echo
 echo "System test configuration completed."
diff --git a/example/diameter/launcher/deployments/st-client/program.sh b/example/diameter/launcher/deployments/st-client/program.sh
index 94dbebf..e470e80 100755
--- a/example/diameter/launcher/deployments/st-client/program.sh
+++ b/example/diameter/launcher/deployments/st-client/program.sh
@@ -201,6 +201,15 @@ else
     [ -z "$dynamic_suffix" ] && _exit "Invalid option !"
   fi
 
+  # Modify xml files path:
+  xmls=( $(echo $dynamic_suffix | sed 's/'\|'/ /g') )
+  dynamic_suffix=$(for xml in ${xmls[@]}
+  do
+    echo $xml | grep -q "\.xml$"
+    [ $? -eq 0 ] && echo -n "$TESTCASE_DIR/"
+    echo -n "${xml}|"
+  done | sed 's/'\|'$//')
+
   while read -r line
   do
     instance=$(echo $line | awk '{ print $1 }')
@@ -209,17 +218,7 @@ else
     ADML_DIR=`readlink -f ADMLS/ADML-$instance`
   
     cd $ADML_DIR
-
-    # Modify xml files path:
-    xmls=( $(echo $dynamic_suffix | sed 's/'\|'/ /g') )
-    dynamic_suffix=$(for xml in ${xmls[@]}
-    do
-      echo $xml | grep -q "\.xml$"
-      [ $? -eq 0 ] && echo -n "$TESTCASE_DIR/"
-      echo -n "${xml}|"
-    done | sed 's/'\|'$//')
-
-    ./operation.sh -t 15 "dynamic|$ini_seq|$fin_seq|$dynamic_suffix"
+    ./operation.sh -t 60 "dynamic|$ini_seq|$fin_seq|$dynamic_suffix"
     cd - >/dev/null
   
   done < $PROGRAM_LAYOUT_FILE
diff --git a/example/diameter/launcher/deployments/st-client/run_all.sh b/example/diameter/launcher/deployments/st-client/run_all.sh
index 3d1c33b..036a42a 100755
--- a/example/diameter/launcher/deployments/st-client/run_all.sh
+++ b/example/diameter/launcher/deployments/st-client/run_all.sh
@@ -11,12 +11,16 @@ fi
 for run in `ls ADMLS/*/run.sh`
 do
   cd `dirname $run`
-  ./run.sh
-  #sleep 0.1
+  instance_name=$(basename $PWD)
+  pkill $instance_name
+  [ $? -eq 0 ] && echo -n "Re-" 
+  echo "Starting $instance_name ..."
+  ./run.sh > /dev/null &
   cd - >/dev/null
 done
-
-sleep 1
+echo
+wait $(jobs -p)
+echo "$(pgrep ADML- | wc -l) instances alive !"
 echo
 echo
 echo "To enable reports dump for failed tests, execute:"