From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Nov 2016 16:26:48 +0000 (+0000)
Subject: regress: make1fuzz: Make fuzzraw-* too
X-Git-Tag: adns-1.6.0~69
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=47275c8cecb4f6f90b9698209e5bac0340a78381;p=adns.git

regress: make1fuzz: Make fuzzraw-* too

And clean and .gitignore them.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/.gitignore b/.gitignore
index aaf3639..89b05ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ regress/*_fuzz
 regress/*_fuzzraw
 regress/output-*.*
 regress/fuzz-*
+regress/fuzzraw-*
 regress/pipe.out
 regress/pipe.err
 regress/harness.h
diff --git a/regress/make1fuzz b/regress/make1fuzz
index a45c24b..f6a8bec 100755
--- a/regress/make1fuzz
+++ b/regress/make1fuzz
@@ -9,21 +9,26 @@ casename="$1"
 playback_prepare
 
 ofuzz="fuzz-$casename"
+ofuzzraw="fuzzraw-$casename"
 
 rm -f "$ofuzz.tmp"
+rm -f "$ofuzzraw.tmp"
 exec >"$ofuzz.tmp"
+exec 6>"$ofuzzraw.tmp"
 
 fuzzout_complete () {
 	mv "$ofuzz.tmp" "$ofuzz"
+	mv "$ofuzzraw.tmp" "$ofuzzraw"
 	exit 0
 }
 
 if test ! -e $playback; then
 	echo 0
+	echo 0 >&6
 	fuzzout_complete
 fi
 
-playback_execute_hook () {
+dump_args () {
 	set "${program}_fuzz" "$@"
 
 	printf "%d\n" "$#"
@@ -32,21 +37,28 @@ playback_execute_hook () {
 		printf "%s\n" "$a"
 	done
 
+	if test -e "$case.in"
+	then
+		inputsz=$(stat -c'%s' -L "$case.in")
+		printf "%d\n" "$inputsz"
+		cat "$case.in"
+	else
+		echo 0
+	fi
+
+	echo
+}	
+
+playback_execute_hook () {
+	dump_args "$@"
+	dump_args "$@" >&6
 	cat <&4 >"$ofuzz.sys.tmp"
 	exec 4<$ofuzz.sys.tmp
+	ADNS_TEST_FUZZRAW_DUMP_FD=6
+	export ADNS_TEST_FUZZRAW_DUMP_FD
 }
 playback_execute
 
-if test -e "$case.in"
-then
-	inputsz=$(stat -c'%s' -L "$case.in")
-	printf "%d\n" "$inputsz"
-	cat "$case.in"
-else
-	echo 0
-fi
-echo
-
 cat $ofuzz.sys.tmp
 
 fuzzout_complete
diff --git a/settings.make.in b/settings.make.in
index d69c8af..2d9b6d6 100644
--- a/settings.make.in
+++ b/settings.make.in
@@ -29,7 +29,7 @@ clean mostlyclean:
 		rm -f $(TARGETS) $(AUTOCSRCS) $(AUTOCHDRS)
 		rm -f *.o *.tmp* *.so *.so.* pipe.*
 		rm -f output-*.err output-*.leftover
-		rm -f output-*.out output-*.report fuzz-* fuzzcat.d
+		rm -f output-*.out output-*.report fuzz-* fuzzraw-* fuzzcat.d
 
 distclean:		clean
 		rm -f *~ ./#*# core *.orig *.rej Makefile config.h