Merge pull request #419 from nfi/contrib/lwm2m-tests
Fixed some issues with the LWM2M IPSO and standalone regression tests
This commit is contained in:
commit
566ebdff78
@ -3,12 +3,13 @@
|
|||||||
# Contiki directory
|
# Contiki directory
|
||||||
CONTIKI=$1
|
CONTIKI=$1
|
||||||
# Test basename
|
# Test basename
|
||||||
BASENAME=06-lwm2m-test
|
BASENAME=06-lwm2m-ipso-test
|
||||||
|
|
||||||
IPADDR=fd00::302:304:506:708
|
IPADDR=fd00::302:304:506:708
|
||||||
|
|
||||||
# Starting Contiki-NG native node
|
# Starting Contiki-NG native node
|
||||||
echo "Starting native node - lwm2m/ipso objects"
|
echo "Starting native node - lwm2m/ipso objects"
|
||||||
|
make -C $CONTIKI/examples/ipso-objects clean >/dev/null
|
||||||
make -C $CONTIKI/examples/ipso-objects > make.log 2> make.err
|
make -C $CONTIKI/examples/ipso-objects > make.log 2> make.err
|
||||||
sudo $CONTIKI/examples/ipso-objects/example-ipso-objects.native > node.log 2> node.err &
|
sudo $CONTIKI/examples/ipso-objects/example-ipso-objects.native > node.log 2> node.err &
|
||||||
CPID=$!
|
CPID=$!
|
||||||
@ -19,7 +20,15 @@ wget -nc https://joakimeriksson.github.io/resources/leshan-server-demo-1.0.0-SNA
|
|||||||
echo "Starting leshan server"
|
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-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar >leshan.log 2>leshan.err &
|
||||||
LESHID=$!
|
LESHID=$!
|
||||||
sleep 50
|
|
||||||
|
COUNTER=10
|
||||||
|
while [ $COUNTER -gt 0 ]; do
|
||||||
|
sleep 5
|
||||||
|
if grep -q 'OK' leshan.err ; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
let COUNTER-=1
|
||||||
|
done
|
||||||
|
|
||||||
echo "Closing native node"
|
echo "Closing native node"
|
||||||
sleep 1
|
sleep 1
|
||||||
|
@ -5,9 +5,10 @@ CONTIKI=$1
|
|||||||
# Test basename
|
# Test basename
|
||||||
BASENAME=07-lwm2m-standalone-test
|
BASENAME=07-lwm2m-standalone-test
|
||||||
|
|
||||||
git clone https://github.com/contiki-ng/example-lwm2m-standalone.git
|
|
||||||
# Building standalone posix example
|
# Building standalone posix example
|
||||||
make -C example-lwm2m-standalone/lwm2m > make.log 2> make.err
|
echo "Compiling standalone posix example"
|
||||||
|
make CONTIKI_NG=../../$CONTIKI -C example-lwm2m-standalone/lwm2m clean >/dev/null
|
||||||
|
make CONTIKI_NG=../../$CONTIKI -C example-lwm2m-standalone/lwm2m >make.log 2>make.err
|
||||||
|
|
||||||
echo "Downloading leshan"
|
echo "Downloading leshan"
|
||||||
wget -nc https://joakimeriksson.github.io/resources/leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar
|
wget -nc https://joakimeriksson.github.io/resources/leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar
|
||||||
@ -20,11 +21,19 @@ example-lwm2m-standalone/lwm2m/lwm2m-example coap://127.0.0.1:5686 > node.log 2>
|
|||||||
|
|
||||||
CPID=$!
|
CPID=$!
|
||||||
|
|
||||||
sleep 50
|
COUNTER=10
|
||||||
|
while [ $COUNTER -gt 0 ]; do
|
||||||
|
sleep 5
|
||||||
|
if grep -q 'OK' leshan.err ; then
|
||||||
|
echo OK with $COUNTER
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
let COUNTER-=1
|
||||||
|
done
|
||||||
|
|
||||||
echo "Closing native node"
|
echo "Closing standalone example"
|
||||||
sleep 1
|
sleep 1
|
||||||
pgrep ipso | sudo xargs kill -9
|
pgrep lwm2m-example | sudo xargs kill -9
|
||||||
|
|
||||||
echo "Closing leshan"
|
echo "Closing leshan"
|
||||||
sleep 1
|
sleep 1
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 7ab51eaaa309c123fbd318c6ad3338cce1e48e48
|
Subproject commit 67b858437f7cf1e4e027d821c4c2ac15fdf2ab44
|
Loading…
Reference in New Issue
Block a user