Fixes

[anna.git] / example / diameter / launcher / deployments / st-client / program.sh

diff --git a/example/diameter/launcher/deployments/st-client/program.sh b/example/diameter/launcher/deployments/st-client/program.sh
index 31eb97d..4d878c0 100755 (executable)
--- a/example/diameter/launcher/deployments/st-client/program.sh
+++ b/example/diameter/launcher/deployments/st-client/program.sh
@@ -53,7 +53,7 @@ Usage: $0 <test stuff directory|dynamic> [-s]
           and a file called 'dynamic.suffix' used to complete the dynamic operation
           in this way:
 
           and a file called 'dynamic.suffix' used to complete the dynamic operation
           in this way:
 

-             dynamic|<timeout ms>|<initial sequence>|<final sequence>|<dynamic.suffix content>
+             dynamic|<initial sequence>|<final sequence>|<dynamic.suffix content>

 
           For example, you could have this content for 'dynamic.suffix':
 
 
           For example, you could have this content for 'dynamic.suffix':
 


@@ -61,11 +61,11 @@ Usage: $0 <test stuff directory|dynamic> [-s]
 
           in order to generate the operation:
 
 
           in order to generate the operation:
 

-             dynamic|0|<initial sequence>|<final sequence>|7|CCR-I.xml|CCR-T.xml
+             dynamic|<initial sequence>|<final sequence>|0|7|CCR-I.xml|CCR-T.xml

 
           which would be parsed for the specific ADML instance programmed:
 
 
           which would be parsed for the specific ADML instance programmed:
 

-             dynamic|0|2000001|2001000|7|CCR-I.xml|CCR-T.xml
+             dynamic|2000001|2001000|0|7|CCR-I.xml|CCR-T.xml

 
           The file 'dynamic.suffix' could have several lines for several scenaries.
           In this case, this script will prompt for the desired one.
 
           The file 'dynamic.suffix' could have several lines for several scenaries.
           In this case, this script will prompt for the desired one.


@@ -110,7 +110,7 @@ echo "Testcases programming ..."
 echo
 cd `dirname $0`
 ./checkStatus.sh
 echo
 cd `dirname $0`
 ./checkStatus.sh

-[ $? -eq 1 ] && _exit "Fix status to continue ..."
+[ $? -eq 1 ] && _exit "Fix status (instances) to continue ..."

 
 # We launch in background !
 #./operation.sh --ping >/dev/null
 
 # We launch in background !
 #./operation.sh --ping >/dev/null


@@ -170,9 +170,6 @@ then
   echo "Programming has finished !"
   echo
   
   echo "Programming has finished !"
   echo
   

-  echo "Configuring repeat cycles ..."
-  ./operation.sh "test|repeats|$REPEATS"
-  

   if [ -n "$specific" ]
   then
     echo "A new file '$TESTCASE_DIR/specific.all' has been created."
   if [ -n "$specific" ]
   then
     echo "A new file '$TESTCASE_DIR/specific.all' has been created."


@@ -184,7 +181,7 @@ then
 
 # dynamic programming #################################################################
 else
 
 # dynamic programming #################################################################
 else

-  TESTCASE_DIR=$(readlink -f dynlibs/libanna_dynamicLauncherProcedure.so | xargs dirname)
+  TESTCASE_DIR=$(readlink -f dynlibs/liblauncher_procedure_default_shared.so | xargs dirname)

   DYNAMIC_SUFFIX_FILE=$TESTCASE_DIR/dynamic.suffix
 
   [ ! -f $DYNAMIC_SUFFIX_FILE ] && _exit "Missing '$DYNAMIC_SUFFIX_FILE' file.\nUse 'dynlibs/select.sh' to change the dynamic procedure and restart the ADML instances."
   DYNAMIC_SUFFIX_FILE=$TESTCASE_DIR/dynamic.suffix
 
   [ ! -f $DYNAMIC_SUFFIX_FILE ] && _exit "Missing '$DYNAMIC_SUFFIX_FILE' file.\nUse 'dynlibs/select.sh' to change the dynamic procedure and restart the ADML instances."


@@ -265,6 +262,12 @@ fi
 
 echo
 echo
 
 echo
 echo

+echo "Configuring repeat cycles ..."
+./operation.sh "test|repeats|$REPEATS" >/dev/null
+echo
+echo "Done !"
+echo
+  

 start_testing=
 if [ "$AUTOSTART" = "-s" ]
 then
 start_testing=
 if [ "$AUTOSTART" = "-s" ]
 then