Really make norecurse tests work.

[adns.git] / regress / r1test

diff --git a/regress/r1test b/regress/r1test
index 4d10101bed755283158c74da2f6bf0e5b473fd2a..142ef19046c0c1c190d43303d372657a08a52120 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,6 +2,9 @@
 # usage: r1test <testcasename>
 
 set -e
+mrc=1
+trap 'exit $mrc' 0
+
 casename="$1"
 case="case-$casename"
 ocase="output-$casename"
@@ -20,6 +23,13 @@ ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
 rc=$?
 set -e
 
+if [ "$rc" = 5 ]
+then
+       echo -n "SKIPPED-$casename "
+       mrc=5
+       exit
+fi
+
 echo "rc=$rc" >>$ocase.out
 
 failed=false
@@ -36,9 +46,9 @@ done
 if $failed
 then
        echo >&2 "FAILED $case - WRONG OUTPUT - lines of syscall remaining `wc -l`"
-       exit 2
+       mrc=2
+       exit
 fi
 
 echo -n "$casename "
-
-exit 0
+mrc=0