diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-05 20:13:17 +0200 |
---|---|---|
committer | Stéphane Desneux <stephane.desneux@iot.bzh> | 2018-10-10 08:16:36 +0000 |
commit | abede0f09cb655271ece0283ae8aab2b3cf4999d (patch) | |
tree | 7b9166ae96d87bfe939172eab7676555a205864d /afm-test.native.sh | |
parent | 1a33ac27fa87b013ca6dc95be53b5b8a40a8f197 (diff) |
Improve exit output message
Display the tests results depending on the chosen
format or inform the user of the error and displaying
in that case the binder(s) log output.
Change-Id: I2437d3b59ef5b864c8e41749b16bf3ed738c9caa
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'afm-test.native.sh')
-rw-r--r-- | afm-test.native.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/afm-test.native.sh b/afm-test.native.sh index 367319e..295102c 100644 --- a/afm-test.native.sh +++ b/afm-test.native.sh @@ -20,10 +20,20 @@ trap "cleanNexit 1" SIGHUP SIGINT SIGABRT SIGTERM cleanNexit() { - rm -f $SOCKETSERVICE 2> /dev/null - trap '' EXIT SIGHUP SIGINT SIGABRT SIGTERM - [ $1 -ne 0 ] && echo "Error: Test launch failed. Code: $1" && cat ${LOGFILETEST} ${LOGFILESERVICE} - exit $1 + rm -f $SOCKETSERVICE 2> /dev/null + trap '' EXIT SIGHUP SIGINT SIGABRT SIGTERM + if [ $1 -ne 0 ] + then + [ -f ${LOGFILESERVICE} ] && cat ${LOGFILESERVICE} + [ -f ${LOGFILETEST} ] && cat ${LOGFILETEST} + echo "Error: Test launch failed. Code: $1" + else + find ${TESTPACKAGEDIR} -maxdepth 1 -name '*.tap' -exec cat {} \; + find ${TESTPACKAGEDIR} -maxdepth 1 -name '*.txt' -exec cat {} \; + find ${TESTPACKAGEDIR} -maxdepth 1 -name '*.xml' -a ! -name 'config.xml' -exec cat {} \; + echo "Tests correctly launched." + fi + exit $1 } function usage() { |