From 7091a846fef07ef3adffc01a37e4b988c1ed86cd Mon Sep 17 00:00:00 2001 From: Rehan MALAK Date: Tue, 29 May 2018 18:32:13 +0200 Subject: [PATCH 1/2] ignore files produced during coap-lwm2m tests --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6bab22c32..31afb98b3 100644 --- a/.gitignore +++ b/.gitignore @@ -60,7 +60,7 @@ COOJA.testlog summary tests/[0-9][0-9]-*/org/ tests/18-coap-lwm2m/Californium.properties -tests/18-coap-lwm2m/leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar +tests/18-coap-lwm2m/leshan-server-demo*.jar # x86 UEFI files cpu/x86/uefi/Makefile.uefi From 9e2e6d74bd8bba5ef94b8e3035daa6ccf59221c1 Mon Sep 17 00:00:00 2001 From: Rehan MALAK Date: Tue, 29 May 2018 18:49:58 +0200 Subject: [PATCH 2/2] leshan server downloaded is the one used by the test --- tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh | 5 +++-- tests/18-coap-lwm2m/07-lwm2m-standalone-test.sh | 5 +++-- tests/18-coap-lwm2m/08-lwm2m-qmode-ipso-test.sh | 5 +++-- tests/18-coap-lwm2m/09-lwm2m-qmode-standalone-test.sh | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh b/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh index ec7502a21..f596206a9 100755 --- a/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh +++ b/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh @@ -17,9 +17,10 @@ CPID=$! sleep 10 echo "Downloading leshan" -wget -nc https://joakimeriksson.github.io/resources/leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar +LESHAN_JAR=leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar +wget -nc https://joakimeriksson.github.io/resources/$LESHAN_JAR echo "Starting leshan server" -java -jar leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar >leshan.log 2>leshan.err & +java -jar $LESHAN_JAR >leshan.log 2>leshan.err & LESHID=$! COUNTER=10 diff --git a/tests/18-coap-lwm2m/07-lwm2m-standalone-test.sh b/tests/18-coap-lwm2m/07-lwm2m-standalone-test.sh index a1257f36e..2e6371896 100755 --- a/tests/18-coap-lwm2m/07-lwm2m-standalone-test.sh +++ b/tests/18-coap-lwm2m/07-lwm2m-standalone-test.sh @@ -12,9 +12,10 @@ make CONTIKI_NG=../../$CONTIKI -C example-lwm2m-standalone/lwm2m clean >/dev/nul make CONTIKI_NG=../../$CONTIKI -C example-lwm2m-standalone/lwm2m >make.log 2>make.err echo "Downloading leshan" -wget -nc https://joakimeriksson.github.io/resources/leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar +LESHAN_JAR=leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar +wget -nc https://joakimeriksson.github.io/resources/$LESHAN_JAR echo "Starting leshan server" -java -jar leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar -lp 5686 -slp 5687 >leshan.log 2>leshan.err & +java -jar $LESHAN_JAR -lp 5686 -slp 5687 >leshan.log 2>leshan.err & LESHID=$! echo "Starting lwm2m standalone example" diff --git a/tests/18-coap-lwm2m/08-lwm2m-qmode-ipso-test.sh b/tests/18-coap-lwm2m/08-lwm2m-qmode-ipso-test.sh index 2b3d52c3e..b5ce6aa3f 100755 --- a/tests/18-coap-lwm2m/08-lwm2m-qmode-ipso-test.sh +++ b/tests/18-coap-lwm2m/08-lwm2m-qmode-ipso-test.sh @@ -16,9 +16,10 @@ CPID=$! sleep 10 echo "Downloading leshan with Q-Mode support" -wget -nc https://carlosgp143.github.io/resources/leshan-server-demo-qmode-support1.0.0-SNAPSHOT-jar-with-dependencies.jar +LESHAN_JAR=leshan-server-demo-qmode-support1.0.0-SNAPSHOT-jar-with-dependencies.jar +wget -nc https://carlosgp143.github.io/resources/$LESHAN_JAR echo "Starting leshan server with Q-Mode enabled" -java -jar leshan-server-demo-qmode-support1.0.0-SNAPSHOT-jar-with-dependencies.jar >leshan.log 2>leshan.err & +java -jar $LESHAN_JAR >leshan.log 2>leshan.err & LESHID=$! COUNTER=10 diff --git a/tests/18-coap-lwm2m/09-lwm2m-qmode-standalone-test.sh b/tests/18-coap-lwm2m/09-lwm2m-qmode-standalone-test.sh index 57f0e3f71..d84d3cd93 100755 --- a/tests/18-coap-lwm2m/09-lwm2m-qmode-standalone-test.sh +++ b/tests/18-coap-lwm2m/09-lwm2m-qmode-standalone-test.sh @@ -11,9 +11,10 @@ make CONTIKI_NG=../../$CONTIKI -C example-lwm2m-standalone/lwm2m clean >/dev/nul make CONTIKI_NG=../../$CONTIKI -C example-lwm2m-standalone/lwm2m DEFINES=LWM2M_QUEUE_MODE_CONF_ENABLED=1,LWM2M_QUEUE_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION=1,LWM2M_QUEUE_MODE_OBJECT_CONF_ENABLED=1 >make.log 2>make.err echo "Downloading leshan with Q-Mode support" -wget -nc https://carlosgp143.github.io/resources/leshan-server-demo-qmode-support1.0.0-SNAPSHOT-jar-with-dependencies.jar +LESHAN_JAR=leshan-server-demo-qmode-support1.0.0-SNAPSHOT-jar-with-dependencies.jar +wget -nc https://carlosgp143.github.io/resources/$LESHAN_JAR echo "Starting leshan server with Q-Mode enabled" -java -jar leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar -lp 5686 -slp 5687 >leshan.log 2>leshan.err & +java -jar $LESHAN_JAR -lp 5686 -slp 5687 >leshan.log 2>leshan.err & LESHID=$! echo "Starting lwm2m standalone example"