X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2FMakefile.in;h=19266a248078170ee5d0e8d7686dc403961064e9;hb=480e956802bac7ae90c487d027e67e5ab33cb088;hp=49b39f8c0396f838960120d41a9a5f44673d6ddb;hpb=8c09a4c65fb124c379c349f2ef8b84ad9e440545;p=adns.git

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 49b39f8..19266a2 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -1,7 +1,8 @@
 # regress/Makefile[.in] - regression test Makefile
 # 
 #  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
+#    Copyright (C) 2014  Mark Wooding
 #    Copyright (C) 1999-2000,2003,2006  Tony Finch
 #    Copyright (C) 1991 Massachusetts Institute of Technology
 #  (See the file INSTALL for full details.)
@@ -26,36 +27,76 @@ 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
+AUTOCSRCS=	hrecord.c hplayback.c hcommon.c hfuzzraw.c
 include		../settings.make
 include		$(srcdir)/../src/adns.make
 
 DIRCFLAGS=	-I../src -I$(srcdir) -I$(srcdir)/../src
 
 HCPPFLAGS=	-DADNS_REGRESS_TEST -I.
+#HCPPFLAGS+=	-DFUZZRAW_SYNC
 
 REDIRLIBOBJS=	$(addsuffix _d.o, $(basename $(LIBOBJS)))
 HARNLOBJS=	hcommon.o $(REDIRLIBOBJS)
-TARGETS=	$(addsuffix _record, $(CLIENTS)) $(addsuffix _playback, $(CLIENTS))
+TARGETS=	$(addsuffix _record, $(CLIENTS)) \
+		$(addsuffix _playback, $(CLIENTS)) \
+		$(addsuffix _fuzz, $(CLIENTS)) \
+		$(addsuffix _fuzzraw, $(CLIENTS))
 ADH_OBJS=	adh-main_c.o adh-opts_c.o adh-query_c.o
-ALL_OBJS=	$(HARNLOBJS) dtest.o hrecord.o hplayback.o
+ALL_OBJS=	$(HARNLOBJS) dtest.o hrecord.o hplayback.o hnonfuzz.o hfuzz.o
 
 .PRECIOUS:	$(AUTOCSRCS) $(AUTOCHDRS)
 
 all install uninstall: $(TARGETS)
 
-check:		$(TARGETS)
-		srcdir=$(srcdir) $(srcdir)/checkall
+ALL_TESTS:=$(patsubst $(srcdir)/case-%.sys,%,$(wildcard $(srcdir)/case-*.sys))
+
+check:		$(TARGETS) $(addprefix check-,$(ALL_TESTS))
+		@echo
+		@echo 'all tests passed or maybe skipped.'
+
+checkfuzz:		$(TARGETS) \
+			$(addprefix checkfuzz-,$(ALL_TESTS)) \
+			$(addprefix checkfuzzraw-,$(ALL_TESTS))
+		@echo
+		@echo 'all fuzzes passed or maybe skipped.'
+# this target is mostly useful as prep work for running the fuzzer;
+# it doesn't really test any of adns
+
+fuzzcat.d:	checkfuzz
+		$(srcdir)/categorisefuzz $(ALL_TESTS)
+
+check-%:	case-%.sys
+		@srcdir=$(srcdir) $(srcdir)/r1test $* || test $$? = 5
+
+fuzz-%:		case-%.sys $(TARGETS) make1fuzz shlib
+		srcdir=$(srcdir) $(srcdir)/make1fuzz $*
+
+fuzzraw-%:	fuzz-%
+
+.PRECIOUS: fuzz-%
+
+checkfuzz-%:	fuzz-% $(TARGETS)
+		@srcdir=$(srcdir) $(srcdir)/check1fuzz $<
+
+checkfuzzraw-%:	fuzz-% $(TARGETS)
+		@srcdir=$(srcdir) $(srcdir)/check1fuzz $<
 
 LINK_CMD=	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
-%_record:	%_c.o hrecord.o $(HARNLOBJS)
+%_record:	%_c.o hrecord.o hnonfuzz.o $(HARNLOBJS)
 		$(LINK_CMD)
 
-%_playback:	%_c.o hplayback.o $(HARNLOBJS)
+%_playback:	%_c.o hplayback.o hnonfuzz.o $(HARNLOBJS)
 		$(LINK_CMD)
 
-.SECONDARY: $(addsuffix _c.o, $(CLIENTS))
+%_fuzz:		%_c.o hplayback.o hfuzz.o $(HARNLOBJS)
+		$(LINK_CMD)
+
+%_fuzzraw:	%_c.o hfuzzraw.o hfuzz.o $(HARNLOBJS)
+		$(LINK_CMD)
+
+.SECONDARY: $(addsuffix _c.o, $(filter-out adnshost, $(CLIENTS)))
 # Without this, make will remove <client>_c.o after building <client>.
 # This wastes effort.  (Debian bug #4073.)
 #
@@ -65,7 +106,13 @@ LINK_CMD=	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 #
 # See also Savannah #29620, http://savannah.gnu.org/bugs/index.php?29620
 
-adnshost_%:	$(ADH_OBJS) h%.o $(HARNLOBJS)
+adnshost_%:	$(ADH_OBJS) h%.o hnonfuzz.o $(HARNLOBJS)
+		$(LINK_CMD)
+
+adnshost_fuzz:	$(ADH_OBJS) hplayback.o hfuzz.o $(HARNLOBJS)
+		$(LINK_CMD)
+
+adnshost_fuzzraw: $(ADH_OBJS) hfuzzraw.o hfuzz.o $(HARNLOBJS)
 		$(LINK_CMD)
 
 %_d.o:		$(srcdir)/../src/%.c hredirect.h