giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor modifications related to tools/serial-io/tunslip6

This commit is contained in:
Rehan MALAK 2018-05-28 20:56:12 +02:00
parent 07ac7ff445
commit 12f15a4f27
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/17-tun-rpl-br/04-border-router-traceroute.sh
View File

@ -22,10 +22,9 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
JPID=$!
sleep 20
# Connect to the simlation
# Connect to the simulation
echo "Starting tunslip6"
make -C $CONTIKI/tools tunslip6
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip.log 2>&1 &
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip6.log 2>&1 &
MPID=$!
printf "Waiting for network formation (%d seconds)\n" "$WAIT_TIME"
sleep $WAIT_TIME
@ -49,7 +48,7 @@ if [ $STATUS -eq 0 ] && [ $HOPS -eq $TARGETHOPS ] ; then
printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
else
echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;
echo "==== $BASENAME.tunslip.log ====" ; cat $BASENAME.tunslip.log;
echo "==== $BASENAME.tunslip6.log ====" ; cat $BASENAME.tunslip6.log;
echo "==== $BASENAME.scriptlog ====" ; cat $BASENAME.scriptlog;
printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;

7
tests/17-tun-rpl-br/test-border-router.sh
View File

@ -28,10 +28,9 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
JPID=$!
sleep 20
# Connect to the simlation
# Connect to the simulation
echo "Starting tunslip6"
make -C $CONTIKI/tools tunslip6
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip.log 2>&1 &
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip6.log 2>&1 &
MPID=$!
printf "Waiting for network formation (%d seconds)\n" "$WAIT_TIME"
sleep $WAIT_TIME
@ -55,7 +54,7 @@ if [ $STATUS -eq 0 ] && [ $REPLIES -eq $COUNT ] ; then
printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
else
echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;
echo "==== $BASENAME.tunslip.log ====" ; cat $BASENAME.tunslip.log;
echo "==== $BASENAME.tunslip6.log ====" ; cat $BASENAME.tunslip6.log;
echo "==== $BASENAME.scriptlog ====" ; cat $BASENAME.scriptlog;
printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;

2
tests/17-tun-rpl-br/test-native-border-router.sh
View File

@ -28,7 +28,7 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
JPID=$!
sleep 20
# Connect to the simlation
# Connect to the simulation
echo "Starting native border-router"
nohup make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=native >> $BASENAME.nbr.log 2>&1 &
MPID=$!