summaryrefslogtreecommitdiffstats
path: root/vppinfra/config/test-driver
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2015-12-15 13:20:55 +0000
committerGerrit Code Review <gerrit@projectrotterdam.info>2015-12-15 13:20:55 +0000
commitec65a1afd3f118849a7629d99ab2a1dcd2dda341 (patch)
tree249f8c92d27b02a63fe844d107a42920d727836e /vppinfra/config/test-driver
parent5e7ac9dc825d06b30bfb970860ccc7a3f2696c6e (diff)
parent29b6af9f97b0002a4ba495eade7727c1ecb4f3c2 (diff)
Merge "Remove vppversion subtree, move elftool to vppinfra"
Diffstat (limited to 'vppinfra/config/test-driver')
-rwxr-xr-xvppinfra/config/test-driver15
1 files changed, 12 insertions, 3 deletions
diff --git a/vppinfra/config/test-driver b/vppinfra/config/test-driver
index d30605660a0..8e575b017d9 100755
--- a/vppinfra/config/test-driver
+++ b/vppinfra/config/test-driver
@@ -3,7 +3,7 @@
scriptversion=2013-07-13.22; # UTC
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15
# Test script is run here.
"$@" >$log_file 2>&1
estatus=$?
+
if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
+ tweaked_estatus=1
+else
+ tweaked_estatus=$estatus
fi
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@ case $estatus:$expect_failure in
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
# Report outcome to console.
echo "${col}${res}${std}: $test_name"