X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fbasic%2Fconfigure.sh;h=092adfca23e68160819a9da53964621bc3525807;hp=07ee3b1471d355f1fa7eabac1fee270c3e1d724c;hb=ea1b80f8fd0c1b806460f98f4e4cf433698857d9;hpb=74730c7d0e4f713c932d6b06a07644d1c3c6c6c1 diff --git a/example/diameter/launcher/deployments/basic/configure.sh b/example/diameter/launcher/deployments/basic/configure.sh index 07ee3b1..092adfc 100755 --- a/example/diameter/launcher/deployments/basic/configure.sh +++ b/example/diameter/launcher/deployments/basic/configure.sh @@ -5,7 +5,7 @@ ############# # General -EXE_BN=ADML-launcher +EXE_BN=ADML ############# # FUNCTIONS # @@ -24,11 +24,12 @@ createRunScript () { cat << EOF > run.sh #!/bin/bash cd \`dirname \$0\` -STARTED=\`pgrep $1 2>/dev/null\` +STARTED=\`pgrep $1$ 2>/dev/null\` [ \$? -eq 0 ] && { echo "Already started!"; echo "\$STARTED" ; exit 1 ; } 0> launcher.trace -rm -f counters/* +rm -f counters/* test-reports/* # Execution line: +export LD_LIBRARY_PATH=\$PWD/dynlibs ./$@ --services services.xml & echo \$! > .pid EOF @@ -62,7 +63,7 @@ tol=$(get_tol $option) ln -sf services/${tol}.xml services.xml # Tracing -DEBUG="--cntDir counters" +DEBUG="--cntDir counters --tmDir test-reports" echo echo "Enable debug traces ? (y/n) [n]:" read enable @@ -73,7 +74,6 @@ read enable KINDNESS= echo echo "Strict xml for decoded messages ? (y/n) [y]:" -echo " (ignoring flags turns a made-up xml representation; execute './$EXE_BN | grep -A1 ignoreFlags:' for more help)" read strict [ "$strict" = "" ] && strict=y [ "$strict" = "n" ] && KINDNESS="--ignoreFlags" @@ -81,15 +81,14 @@ if [ "$option" = "s" ] then echo echo "Ignore errors ? (y/n) [n]:" - echo " (ignoring errors, the process won't answer Failed-AVP automatically; execute './$EXE_BN | grep -A1 ignoreErrors:' for more help)" read i_errors [ "$i_errors" = "" ] && i_errors=n [ "$i_errors" = "y" ] && KINDNESS="$KINDNESS --ignoreErrors" fi # Run script: -EXE_LINK=ADML-$tol -ln -sf $EXE_BN $EXE_LINK +EXE_LINK=`basename $PWD` +[ "$EXE_BN" != "$EXE_LINK" ] && ln -sf $EXE_BN $EXE_LINK case $tol in