Don't complain so much about poll(2) tests if not available.

diff --git a/changelog b/changelog
index 16cc744a9c0f6ce6007a076d639894f8473d1c01..2f96f277add07dc7f67ffadc094bde451fa73e4b 100644 (file)
--- a/changelog
+++ b/changelog
@@ -3,12 +3,14 @@ adns (0.5) unstable; urgency=medium
   Incompatible changes:
   * RRs with mailboxes never rejected due to strange chars if _raw.
   * Lack of a mailbox produces `.' not `<>'.
+  * Better usage messages (and no default query domain) for adnstest.
   
   Bugfixes and portability improvements:
   * Mailboxes containing spaces in their names are quoted.
   * adns_rr_hostaddr naddrs is -1 on temporary failure (as documented).
   * Give install the '-c' flag (otherwise some delete the original !).
   * Reject TXT RRs with no strings.
+  * Don't complain so much about poll(2) tests if not available.
 
  --
 

diff --git a/regress/checkall b/regress/checkall
index 0765eab89b9539d166e6dad083b866f50c658b2b..64bd93571374a69170993350351b0a9f9ae54077 100755 (executable)
--- a/regress/checkall
+++ b/regress/checkall
@@ -1,31 +1,46 @@
 #!/bin/sh
 
+set -e
+
 failed=''
 passed=''
+skipped=''
 
 for f in case-*.sys
 do
        case="`echo \"$f\" | sed -e 's/^case-//; s/\.sys$//'`"
-       if ./r1test $case
-       then
-               passed="$passed $case"
-       else
-               echo
+       set +e
+       ./r1test $case
+       rc=$?
+       set -e
+       case $rc in
+       0)      passed="$passed $case" ;;
+       5)      skipped="$skipped $case" ;;
+       *)      echo
                failed="$failed $case"
                echo
-       fi
+               ;;
+       esac
 done
 
 if [ "x$failed" = x ]
 then
        echo "
-all tests passed."
+"
+       if [ "x$skipped" = x ]
+       then
+               echo "all tests passed."
+       else
+               echo "all applicable tests passed (skipped:$skipped)"
+       fi
+       echo
        exit 0
 fi
 
 echo >&2 "
 AT LEAST ONE TEST FAILED
 passed tests:${passed:- NONE}
+skipped tests:${skipped:- NONE}
 failed tests:$failed
 "
 

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