diff --git a/examples/etsi_coaptest.sh b/examples/etsi_coaptest.sh index 36feb60c..4049797f 100755 --- a/examples/etsi_coaptest.sh +++ b/examples/etsi_coaptest.sh @@ -36,7 +36,7 @@ testgroups=( CORE LINK BLOCK OBS ) testnumber=-1 group='' -source etsi_testcases.sh +source `dirname $0`/etsi_testcases.sh function usage { echo "Usage: `basename $0` [-n testnumber] [-g groupname] [-t timeout] [-P server_port] [-p client port] [-d logdir] [-v] -i interface server_address" 1>&2 diff --git a/examples/etsi_testcases.sh b/examples/etsi_testcases.sh index 39588d82..63ba9a53 100644 --- a/examples/etsi_testcases.sh +++ b/examples/etsi_testcases.sh @@ -481,8 +481,8 @@ function TD_COAP_LINK_01 { if [[ ! $(echo $clientoutput | grep rt) ]] ; then echo "no resource with attribute rt found on server" else - rt="${clientoutput##*rt=\"}" - rt="${rt%%\";*}" + rt="${clientoutput##*rt=}" + rt="${rt%%;*}" fi echo -e "\nOutput of client:" echo -e $clientoutput @@ -762,4 +762,4 @@ function TD_COAP_OBS_05 { #"-v 5 -B $clienttimeout -p $CLIENTPORT -s 0 -N" testaddress=coap://[::1]/obs start_coap_test $1 -} \ No newline at end of file +}