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

CI border router tests: rename *.tunsliplog to *.tunslip.log to comply with .gitignore

This commit is contained in:
Simon Duquennoy 2017-11-17 14:08:44 -08:00
parent 87d57583e5
commit 53dd64a8c8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/17-rpl-border-router/04-border-router-traceroute.sh
View File

@ -23,7 +23,7 @@ sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
# Connect to the simlation
echo "Starting tunslip6"
make -C $CONTIKI/tools tunslip6
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunsliplog 2>&1 &
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip.log 2>&1 &
MPID=$!
echo "Waiting for network formation"
sleep 5
@ -49,10 +49,10 @@ else
# Verbose output when using CI
if [ "$CI" = "true" ]; then
echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;
echo "==== $BASENAME.tunsliplog ====" ; cat $BASENAME.tunsliplog;
echo "==== $BASENAME.tunslip.log ====" ; cat $BASENAME.tunslip.log;
echo "==== $BASENAME.scriptlog ====" ; cat $BASENAME.scriptlog;
else
echo "==== Check $BASENAME.coojalog, $BASENAME.tunsliplog, and $BASENAME.scriptlog for details ====";
echo "==== Check $BASENAME.coojalog, $BASENAME.tunslip.log, and $BASENAME.scriptlog for details ====";
fi;
printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;

6
tests/17-rpl-border-router/test-border-router.sh
View File

@ -21,7 +21,7 @@ sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
# Connect to the simlation
echo "Starting tunslip6"
make -C $CONTIKI/tools tunslip6
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunsliplog 2>&1 &
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip.log 2>&1 &
MPID=$!
echo "Waiting for network formation"
sleep 5
@ -46,10 +46,10 @@ else
# Verbose output when using CI
if [ "$CI" = "true" ]; then
echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;
echo "==== $BASENAME.tunsliplog ====" ; cat $BASENAME.tunsliplog;
echo "==== $BASENAME.tunslip.log ====" ; cat $BASENAME.tunslip.log;
echo "==== $BASENAME.scriptlog ====" ; cat $BASENAME.scriptlog;
else
echo "==== Check $BASENAME.coojalog, $BASENAME.tunsliplog, and $BASENAME.scriptlog for details ====";
echo "==== Check $BASENAME.coojalog, $BASENAME.tunslip.log, and $BASENAME.scriptlog for details ====";
fi;
printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;