From 53dd64a8c87578188ffacf034cd3c099a4f7f585 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Fri, 17 Nov 2017 14:08:44 -0800 Subject: [PATCH] CI border router tests: rename *.tunsliplog to *.tunslip.log to comply with .gitignore --- tests/17-rpl-border-router/04-border-router-traceroute.sh | 6 +++--- tests/17-rpl-border-router/test-border-router.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/17-rpl-border-router/04-border-router-traceroute.sh b/tests/17-rpl-border-router/04-border-router-traceroute.sh index 52d2f102c..f00ff0c6f 100755 --- a/tests/17-rpl-border-router/04-border-router-traceroute.sh +++ b/tests/17-rpl-border-router/04-border-router-traceroute.sh @@ -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; diff --git a/tests/17-rpl-border-router/test-border-router.sh b/tests/17-rpl-border-router/test-border-router.sh index 854abebf1..581292546 100755 --- a/tests/17-rpl-border-router/test-border-router.sh +++ b/tests/17-rpl-border-router/test-border-router.sh @@ -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;