egression test doesn't rely on value of O_NONBLOCK and other flags.

[adns.git] / regress / r1test

diff --git a/regress/r1test b/regress/r1test
index a9ec3ce627d999c43929dd5e23215111ad59509b..3b2bfdf15125a7d8f649228f22d582cd283da481 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -20,24 +20,25 @@ ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
 rc=$?
 set -e
 
-if test $rc != 0
-then
-       egrep . -- "$ocase.report" "$ocase.out" "$ocase.err"
-       echo >&2 "FAILED $case - EXIT STATUS $rc"
-       exit 2
-fi
+echo "rc=$rc" >>$ocase.out
 
-for part in out err
+failed=false
+for part in err out
 do
-       if diff -- "$case.$part" "$ocase.$part"
+       if diff -u -- "$case.$part" "$ocase.$part"
        then
                :
        else
-               echo >&2 "FAILED $case - WRONG OUTPUT"
-               exit 2
+               failed=true
        fi
 done
 
+if $failed
+then
+       echo >&2 "FAILED $case - WRONG OUTPUT - lines of syscall remaining `wc -l`"
+       exit 2
+fi
+
 echo -n "$casename "
 
 exit 0