diff options
Diffstat (limited to 'testsuite/testing.sh')
| -rwxr-xr-x | testsuite/testing.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/testsuite/testing.sh b/testsuite/testing.sh index e253e1aa6..7897c1622 100755 --- a/testsuite/testing.sh +++ b/testsuite/testing.sh @@ -37,7 +37,7 @@ export SKIP= # Helper functions -optional() +optional () { option=`echo "$OPTIONFLAGS" | egrep "(^|:)$1(:|\$)"` # Not set? @@ -55,6 +55,7 @@ testing () { NAME="$1" [ -z "$1" ] && NAME=$2 + ret=0 if [ $# -ne 5 ] then @@ -76,12 +77,15 @@ testing () echo -ne "$5" | eval "$2" > actual RETVAL=$? - cmp expected actual > /dev/null - if [ $? -ne 0 ] + cmp expected actual > /dev/null || ret=$? + if [ $ret -ne 0 ] then FAILCOUNT=$[$FAILCOUNT+1] echo "FAIL: $NAME" - [ -n "$VERBOSE" ] && diff -u expected actual + if [ -n "$VERBOSE" ] + then + diff -u expected actual || /bin/true + fi else echo "PASS: $NAME" fi @@ -97,7 +101,7 @@ testing () # the file is assumed to already be there and only its library dependencies # are copied. -function mkchroot +mkchroot () { [ $# -lt 2 ] && return @@ -126,7 +130,7 @@ function mkchroot # Needed commands listed on command line # Script fed to stdin. -function dochroot +dochroot () { mkdir tmpdir4chroot mount -t ramfs tmpdir4chroot tmpdir4chroot |