From: ian <ian>
Date: Sat, 16 Sep 2000 22:26:05 +0000 (+0000)
Subject: Do not run tests of executables not built.  Do not build
X-Git-Tag: rel-adns-pre-1-0--1~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=a069d77f2601cbaf8a6eca34e0af656c7f39ae9e

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 2d64e61..abe6f72 100644
--- 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).
-   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
+              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.
diff --git a/changelog b/changelog
index fe27c64..e7cab03 100644
--- 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>.
-  * #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".
diff --git a/client/adnshost.h b/client/adnshost.h
index 1fff4ef..b1e7c87 100644
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -36,6 +36,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <time.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/regress/Makefile.in b/regress/Makefile.in
index 5da4e28..3a40a68 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -24,7 +24,9 @@
 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
diff --git a/regress/hplayback.c b/regress/hplayback.c
index 92570ff..fdb3a7d 100644
--- 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/time.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "harness.h"
diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index 39f409c..4c8fb4d 100644
--- 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/time.h>
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/regress/r1test b/regress/r1test
index a325600..8f0c411 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -56,10 +56,18 @@ else
 	exec </dev/null
 fi
 
+playback=./${program}_playback
+if test ! -f $playback
+then
+	printf "SKIPPED-$casename "
+	mrc=5
+	exit
+fi
+
 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
 
@@ -83,7 +91,7 @@ do
 	fi
 done
 
-cat >"$ocase.leftover"
+cat <&4 >"$ocase.leftover"
 if egrep . /dev/null "$ocase.leftover"
 then
 	failwhy="$failwhy EXITED EARLY"