Do not run tests of executables not built. Do not build

adnsresfilter_record/playback.  Add missing #include <sys/time.h>,
<time.h>

diff --git a/INSTALL b/INSTALL
index 2d64e61c6ae76beed22e3786c2f8379d02d76686..abe6f7200309fc570eb1ffc13ba94ebab817092e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -18,10 +18,11 @@ The following platforms have been tested at at least some point and
 should work - please report if they don't:
   [adns]       OS
    pre-1.0     Linux glibc 2.1 (actually tested on Debian 2.2).
 should work - please report if they don't:
   [adns]       OS
    pre-1.0     Linux glibc 2.1 (actually tested on Debian 2.2).

-   pre-1.0     FreeBSD 3.2             
+   pre-1.0     FreeBSD 3.2

    pre-1.0     Solaris 2.6, 2.7, 2.8
    pre-1.0     HP-UX 10.20, 11.00
    pre-1.0     IRIX 6.5 *not* with GCC [1], --disable-dynamic
    pre-1.0     Solaris 2.6, 2.7, 2.8
    pre-1.0     HP-UX 10.20, 11.00
    pre-1.0     IRIX 6.5 *not* with GCC [1], --disable-dynamic

+              AIX no dynamic

 Later versions of the same OS should work too.  [adns] is the latest
 version of adns that has been tested.  Usually entries in this table
 mean they pass adns's own regression test, when compiled with GCC.
 Later versions of the same OS should work too.  [adns] is the latest
 version of adns that has been tested.  Usually entries in this table
 mean they pass adns's own regression test, when compiled with GCC.

diff --git a/changelog b/changelog
index fe27c64c5c0411fa150a833c4130b96b5af4c529..e7cab03121de85ca11692fcfb163d41999cad198 100644 (file)
--- a/changelog
+++ b/changelog
@@ -14,7 +14,7 @@ adns (0.10) unstable; urgency=low
 
   Portability fixes:
   * Fix <sys/fcntl.h> in client/adnsresfilter.c to <fcntl.h>.
 
   Portability fixes:
   * Fix <sys/fcntl.h> in client/adnsresfilter.c to <fcntl.h>.

-  * #include <sys/types.h> and <unistd.h> for fcntl in */*.c.
+  * Add missing <sys/types.h>, <unistd.h>, <time.h>, <sys/time.h>.

   * Cope with compilers that don't do `inline'.
   * Do not use variadic macro, use stdarg instead (adnslogres.c).
   * #include "config.h" before "adns.h".
   * Cope with compilers that don't do `inline'.
   * Do not use variadic macro, use stdarg instead (adnslogres.c).
   * #include "config.h" before "adns.h".

diff --git a/client/adnshost.h b/client/adnshost.h
index 1fff4ef8286c0b9ad78e7be9ad46f516d5bdc567..b1e7c875b2ced26258b4f9035e51e7d7835ef657 100644 (file)
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -36,6 +36,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>

+#include <time.h>

 
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 5da4e2891fd53fee4867e4e8bc4242ef36519a40..3a40a6893f0f0a680f3a4b875d367bf1735b975a 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -24,7 +24,9 @@
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 

-CLIENTS=       adnstest adnshost adnslogres adnsresfilter
+PROGS_SYSDEP=  @PROGS_HAVE_TSEARCH@
+
+CLIENTS=       adnstest adnshost adnslogres $(PROGS_SYSDEP)

 AUTOCHDRS=     harness.h hsyscalls.h hredirect.h
 AUTOCSRCS=     hrecord.c hplayback.c hcommon.c
 include                $(srcdir)/../settings.make
 AUTOCHDRS=     harness.h hsyscalls.h hredirect.h
 AUTOCSRCS=     hrecord.c hplayback.c hcommon.c
 include                $(srcdir)/../settings.make

diff --git a/regress/hplayback.c b/regress/hplayback.c
index 92570ff90c827a8ab19ef3c0795f11bb47b8a34f..fdb3a7d307e17eecf699d30fa8ceec9e9b174e29 100644 (file)
--- a/regress/hplayback.c
+++ b/regress/hplayback.c
@@ -6,6 +6,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

+#include <sys/time.h>

 #include <unistd.h>
 #include <fcntl.h>
 #include "harness.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include "harness.h"

diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index 39f409c0bc6ac50d7323a2cddaf144333ae1ae2e..4c8fb4d71236f3d9e675b704e07bab4a0e36ff7b 100644 (file)
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -34,6 +34,7 @@ m4_include(hmacros.i4)
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

+#include <sys/time.h>

 
 #include <unistd.h>
 #include <fcntl.h>
 
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/regress/r1test b/regress/r1test
index a325600830ed437fdb8ac1b6a6ffcc71b93080a1..8f0c41173d69f74ee0914c859a5aee350e257878 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -56,10 +56,18 @@ else
        exec </dev/null
 fi
 
        exec </dev/null
 fi
 

+playback=./${program}_playback
+if test ! -f $playback
+then
+       printf "SKIPPED-$casename "
+       mrc=5
+       exit
+fi
+

 set +e
 set +e

-ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
-ADNS_TEST_IN_FD=4 \
- ./${program}_playback $initflags"$initstring" $queryargs
+ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \
+ 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
+ $playback $initflags"$initstring" $queryargs

 rc=$?
 set -e
 
 rc=$?
 set -e
 


@@ -83,7 +91,7 @@ do
        fi
 done
 
        fi
 done
 

-cat >"$ocase.leftover"
+cat <&4 >"$ocase.leftover"

 if egrep . /dev/null "$ocase.leftover"
 then
        failwhy="$failwhy EXITED EARLY"
 if egrep . /dev/null "$ocase.leftover"
 then
        failwhy="$failwhy EXITED EARLY"