X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fst-client%2Fprogram.sh;h=4d878c01db7da69fe450aafae8e1222ea181c59b;hp=31eb97d44941778e2e4249b83d7b891a5d27b339;hb=e08f7cf02151389d0b871029ba0fba177157bb8d;hpb=d723d5bf571eb48c641b092058eaa38bb6c4fcc8 diff --git a/example/diameter/launcher/deployments/st-client/program.sh b/example/diameter/launcher/deployments/st-client/program.sh index 31eb97d..4d878c0 100755 --- a/example/diameter/launcher/deployments/st-client/program.sh +++ b/example/diameter/launcher/deployments/st-client/program.sh @@ -53,7 +53,7 @@ Usage: $0 [-s] and a file called 'dynamic.suffix' used to complete the dynamic operation in this way: - dynamic|||| + dynamic||| For example, you could have this content for 'dynamic.suffix': @@ -61,11 +61,11 @@ Usage: $0 [-s] in order to generate the operation: - dynamic|0|||7|CCR-I.xml|CCR-T.xml + dynamic|||0|7|CCR-I.xml|CCR-T.xml 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. @@ -110,7 +110,7 @@ echo "Testcases programming ..." 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 @@ -170,9 +170,6 @@ then 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." @@ -184,7 +181,7 @@ then # 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." @@ -265,6 +262,12 @@ fi echo echo +echo "Configuring repeat cycles ..." +./operation.sh "test|repeats|$REPEATS" >/dev/null +echo +echo "Done !" +echo + start_testing= if [ "$AUTOSTART" = "-s" ] then