X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2FMakefile.in;h=993c1af66e2fbda331aee965ac2bfc8d3665c43e;hb=HEAD;hp=e0d84a96a3c76626d8787a6b5a4cc8573074633b;hpb=ef45d8c24024fa01378e0c0006e19b0d3e881761;p=adns.git

diff --git a/regress/Makefile.in b/regress/Makefile.in
index e0d84a9..eb63a20 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -1,11 +1,7 @@
 # regress/Makefile[.in] - regression test Makefile
 # 
-#  This file is part of adns, which is
-#    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.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -64,7 +60,15 @@ checkfuzz:		$(TARGETS) \
 # it doesn't really test any of adns
 
 fuzzcat.d:	checkfuzz
-		$(srcdir)/categorizefuzz $(ALL_TESTS)
+		$(srcdir)/categorisefuzz $(ALL_TESTS)
+		perl -ne 'print $$1,"\n" while m/\"([^"% ]{2,})\"/g' \
+			$(srcdir)/../src/*.[ch] $(srcdir)/../client/*.[ch] \
+		| sort -u >fuzzcat.d/dictionary
+		perl -p -e 'chomp;' \
+			-e 's/[^0-9a-z-_]/sprintf "\\x%02x", ord $$&/ige;' \
+			-e 's/^/l$$.="/; ' \
+			-e 's/$$/"\n/;' \
+			fuzzcat.d/dictionary >fuzzcat.d/dictionary.afl
 
 check-%:	case-%.sys
 		@srcdir=$(srcdir) $(srcdir)/r1test $* || test $$? = 5
@@ -79,7 +83,7 @@ fuzzraw-%:	fuzz-%
 checkfuzz-%:	fuzz-% $(TARGETS)
 		@srcdir=$(srcdir) $(srcdir)/check1fuzz $<
 
-checkfuzzraw-%:	fuzzraw-% $(TARGETS)
+checkfuzzraw-%:	fuzz-% $(TARGETS)
 		@srcdir=$(srcdir) $(srcdir)/check1fuzz $<
 
 LINK_CMD=	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
@@ -115,10 +119,10 @@ adnshost_fuzz:	$(ADH_OBJS) hplayback.o hfuzz.o $(HARNLOBJS)
 adnshost_fuzzraw: $(ADH_OBJS) hfuzzraw.o hfuzz.o $(HARNLOBJS)
 		$(LINK_CMD)
 
-%_d.o:		$(srcdir)/../src/%.c hredirect.h
+%_d.o:		$(srcdir)/../src/%.c hredirect.h hsyscalls.h
 		$(CC) $(CFLAGS) $(HCPPFLAGS) -c -g -o $@ $<
 
-%_c.o:		$(srcdir)/../client/%.c hredirect.h
+%_c.o:		$(srcdir)/../client/%.c hredirect.h hsyscalls.h
 		$(CC) $(CFLAGS) $(HCPPFLAGS) -I $(srcdir)/../src -c -g -o $@ $<
 
 $(ALL_OBJS):	$(srcdir)/../src/adns.h $(srcdir)/../src/internal.h