From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Nov 2016 15:20:37 +0000 (+0000)
Subject: regress: Reorganise r1test and make1fuzz some more
X-Git-Tag: adns-1.6.0~71
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fc66304bb37f079708551e69b45ed5a5d64b0405;p=adns.git

regress: Reorganise r1test and make1fuzz some more

We are going to want make1fuzz to make the raw fuzzer input too.
That's done by the playback programs, so we need to call them.

This means it needs to make a copy of the syscall stream made by
playback_prepare.

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

diff --git a/regress/make1fuzz b/regress/make1fuzz
index a7a08f2..a45c24b 100755
--- a/regress/make1fuzz
+++ b/regress/make1fuzz
@@ -23,7 +23,7 @@ if test ! -e $playback; then
 	fuzzout_complete
 fi
 
-playback_execute_callback () {
+playback_execute_hook () {
 	set "${program}_fuzz" "$@"
 
 	printf "%d\n" "$#"
@@ -31,6 +31,9 @@ playback_execute_callback () {
 		printf "%d\n" "${#a}"
 		printf "%s\n" "$a"
 	done
+
+	cat <&4 >"$ofuzz.sys.tmp"
+	exec 4<$ofuzz.sys.tmp
 }
 playback_execute
 
@@ -44,6 +47,6 @@ else
 fi
 echo
 
-cat <&4
+cat $ofuzz.sys.tmp
 
 fuzzout_complete
diff --git a/regress/r1test b/regress/r1test
index 74d7df2..591369c 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -51,14 +51,7 @@ then
 	exit
 fi
 
-playback_execute_callback () {
-	set +e
-	ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \
-	 3>>"$ocase.report" 4<&4 >"$ocase.out" 2>"$ocase.err" \
-	 $ADNS_TEST_DEBUG $playback "$@"
-	rc=$?
-	set -e
-}
+playback_execute_hook () { :; }
 playback_execute
 
 if [ "$rc" = 5 ]
diff --git a/regress/shlib b/regress/shlib
index c8d3fcc..6f855d5 100644
--- a/regress/shlib
+++ b/regress/shlib
@@ -20,6 +20,16 @@ playback_prepare () {
 	playback=./${program}_playback
 }
 
+playback_execute_core () {
+	playback_execute_hook "$@"
+	set +e
+	ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \
+	 3>>"$ocase.report" 4<&4 >"$ocase.out" 2>"$ocase.err" \
+	 $ADNS_TEST_DEBUG $playback "$@"
+	rc=$?
+	set -e
+}
+
 playback_execute () {
-	playback_execute_callback $initflags"$initstring" $queryargs
+	playback_execute_core $initflags"$initstring" $queryargs
 }