From 45ef10ff640542624fd56391c6058954eacd559b Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 14 Nov 2017 10:00:15 +0100 Subject: [PATCH] CI script tests: homogenize logs --- tests/17-rpl-border-router/test-border-router.sh | 4 ++-- tests/18-native-networking/01-native-ping.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/17-rpl-border-router/test-border-router.sh b/tests/17-rpl-border-router/test-border-router.sh index 260f9a4f9..db399ca70 100755 --- a/tests/17-rpl-border-router/test-border-router.sh +++ b/tests/17-rpl-border-router/test-border-router.sh @@ -38,7 +38,7 @@ rm COOJA.testlog rm COOJA.log if [ $STATUS -eq 0 ] ; then - echo "$BASENAME: TEST OK" | tee $BASENAME.testlog; + printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog; else # Verbose output when using CI if [ "$CI" = "true" ]; then @@ -49,7 +49,7 @@ else echo "==== Check $BASENAME.coojalog, $BASENAME.tunsliplog, and $BASENAME.scriptlog for details ===="; fi; - echo "$BASENAME: TEST FAIL ಠ_ಠ" | tee $BASENAME.testlog; + printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog; fi # We do not want Make to stop -> Return 0 diff --git a/tests/18-native-networking/01-native-ping.sh b/tests/18-native-networking/01-native-ping.sh index 144554499..c6acb733c 100755 --- a/tests/18-native-networking/01-native-ping.sh +++ b/tests/18-native-networking/01-native-ping.sh @@ -26,7 +26,7 @@ sudo kill -9 $CPID if [ $STATUS -eq 0 ] ; then cp $BASENAME.log $BASENAME.testlog - echo "$BASENAME: TEST OK" | tee -a $BASENAME.testlog; + printf "%-32s TEST OK\n" "$BASENAME" | tee -a $BASENAME.testlog; else mv $BASENAME.log $BASENAME.faillog @@ -39,7 +39,7 @@ else cat node.err cp $BASENAME.log $BASENAME.faillog - echo "$BASENAME: TEST FAIL ಠ_ಠ" | tee -a $BASENAME.testlog; + printf "%-32s TEST FAIL\n" "$BASENAME" | tee -a $BASENAME.testlog; fi # We do not want Make to stop -> Return 0