From 38977b5f2fd8def73a29850ac07baf9d16f8366d Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Sat, 22 Nov 2014 13:39:24 -0500
Subject: [PATCH] [test suite] use exit status in wrapper scripts

---
 test/afl/compile/afl-compile-code-coverage.sh                | 2 +-
 test/afl/compile/afl-compile-no-enable-arg.sh                | 2 +-
 test/afl/compile/afl-compile.sh                              | 2 +-
 test/afl/compile/afl-gen-code-coverage.sh                    | 2 +-
 test/afl/fuzzing-wrappers/client-rc.sh                       | 5 +++--
 test/afl/fuzzing-wrappers/helpers/fwknop-rc-hangs.sh         | 2 +-
 test/afl/fuzzing-wrappers/helpers/fwknop-rc-test.sh          | 2 ++
 .../fuzzing-wrappers/helpers/fwknopd-parse-access-hangs.sh   | 2 +-
 test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh    | 2 ++
 .../afl/fuzzing-wrappers/helpers/fwknopd-parse-conf-hangs.sh | 2 +-
 test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh      | 2 ++
 test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-hangs.sh     | 2 +-
 test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-test.sh      | 2 ++
 test/afl/fuzzing-wrappers/server-access.sh                   | 4 ++--
 test/afl/fuzzing-wrappers/server-conf.sh                     | 4 ++--
 test/afl/fuzzing-wrappers/spa-pkts.sh                        | 4 ++--
 16 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/test/afl/compile/afl-compile-code-coverage.sh b/test/afl/compile/afl-compile-code-coverage.sh
index 6d7d42fd..174cd17c 100755
--- a/test/afl/compile/afl-compile-code-coverage.sh
+++ b/test/afl/compile/afl-compile-code-coverage.sh
@@ -6,4 +6,4 @@ cd afl
 
 ./afl-compile.sh --enable-profile-coverage
 
-exit
+exit $?
diff --git a/test/afl/compile/afl-compile-no-enable-arg.sh b/test/afl/compile/afl-compile-no-enable-arg.sh
index 5e5474fc..de6e38b6 100755
--- a/test/afl/compile/afl-compile-no-enable-arg.sh
+++ b/test/afl/compile/afl-compile-no-enable-arg.sh
@@ -7,4 +7,4 @@ CC=afl-gcc ./extras/apparmor/configure_args.sh $@
 make clean
 make
 cd test/afl
-exit
+exit $?
diff --git a/test/afl/compile/afl-compile.sh b/test/afl/compile/afl-compile.sh
index 332605bf..6e10643b 100755
--- a/test/afl/compile/afl-compile.sh
+++ b/test/afl/compile/afl-compile.sh
@@ -5,4 +5,4 @@ CC=afl-gcc ./extras/apparmor/configure_args.sh --enable-afl-fuzzing $@
 make clean
 make
 cd test/afl
-exit
+exit $?
diff --git a/test/afl/compile/afl-gen-code-coverage.sh b/test/afl/compile/afl-gen-code-coverage.sh
index b17643d6..747f42c1 100755
--- a/test/afl/compile/afl-gen-code-coverage.sh
+++ b/test/afl/compile/afl-gen-code-coverage.sh
@@ -10,4 +10,4 @@ cd afl
 
 echo "[+] Code coverage available in the $RESULTS_DIR/ directory"
 
-exit
+exit $?
diff --git a/test/afl/fuzzing-wrappers/client-rc.sh b/test/afl/fuzzing-wrappers/client-rc.sh
index 69a3d6ad..9059df39 100755
--- a/test/afl/fuzzing-wrappers/client-rc.sh
+++ b/test/afl/fuzzing-wrappers/client-rc.sh
@@ -15,8 +15,9 @@ TS=`date +"%m%d%y%H%M%S"`
 mkdir $OUT_DIR
 
 ### make sure the client can handle the rc file
-./fuzzing-wrappers/helpers/fwknop-rc-test.sh || exit
+./fuzzing-wrappers/helpers/fwknop-rc-test.sh || \
+    { echo "[*] Client rc file fuzzing requires compilation with ./compile/afl-compile-no-enable-args.sh"; exit 1; }
 
 LD_LIBRARY_PATH=$LIB_DIR afl-fuzz -t 1000 -i $IN_DIR -o $OUT_DIR -f $OUT_DIR/fwknoprc $CLIENT --rc-file $OUT_DIR/fwknoprc -T -a 1.1.1.1 -n testhost.com
 
-exit
+exit $?
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknop-rc-hangs.sh b/test/afl/fuzzing-wrappers/helpers/fwknop-rc-hangs.sh
index 7faf9785..ec252688 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknop-rc-hangs.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknop-rc-hangs.sh
@@ -8,4 +8,4 @@ do
     ./$HELPER_SH $f
 done
 
-exit
+exit $?
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknop-rc-test.sh b/test/afl/fuzzing-wrappers/helpers/fwknop-rc-test.sh
index dabd0003..af42ae46 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknop-rc-test.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknop-rc-test.sh
@@ -8,3 +8,5 @@ then
 fi
 
 LD_LIBRARY_PATH=../../lib/.libs ../../client/.libs/fwknop --rc-file $RC_FILE -T -a 1.1.1.1 -n testhost.com
+
+exit $?
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access-hangs.sh b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access-hangs.sh
index 94fa68ca..a2ac62cf 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access-hangs.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access-hangs.sh
@@ -8,4 +8,4 @@ do
     ./$HELPER_SH $f
 done
 
-exit
+exit $?
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh
index e3b4cd89..7a6f39d5 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh
@@ -8,3 +8,5 @@ then
 fi
 
 LD_LIBRARY_PATH=../../lib/.libs ../../server/.libs/fwknopd -c ../conf/ipt_snat_fwknopd.conf -a $ACCESS_FILE -A -f -t --exit-parse-config -D
+
+exit $?
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf-hangs.sh b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf-hangs.sh
index 06f63caf..5d69a7ca 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf-hangs.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf-hangs.sh
@@ -8,4 +8,4 @@ do
     ./$HELPER_SH $f
 done
 
-exit
+exit $?
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh
index 8ab7a04e..8f90f518 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh
@@ -8,3 +8,5 @@ then
 fi
 
 LD_LIBRARY_PATH=../../lib/.libs ../../server/.libs/fwknopd -c $FWKNOPD_CONF_FILE -a ../conf/default_access.conf -A -f -t --exit-parse-config -D
+
+exit $?
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-hangs.sh b/test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-hangs.sh
index 2ee83119..f49dc105 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-hangs.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-hangs.sh
@@ -8,4 +8,4 @@ do
     ./$HELPER_SH $f
 done
 
-exit
+exit $?
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-test.sh b/test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-test.sh
index 00c3addc..7cdb2e4c 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-test.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknopd-stdin-test.sh
@@ -3,3 +3,5 @@
 SPA_PKT="1716411011200157:root:1397329899:2.0.1:1:127.0.0.2,tcp/22:AAAAA"
 
 echo -n $SPA_PKT | LD_LIBRARY_PATH=../../lib/.libs ../../server/.libs/fwknopd -c ../conf/default_fwknopd.conf -a ../conf/default_access.conf -A -f -t
+
+exit $?
diff --git a/test/afl/fuzzing-wrappers/server-access.sh b/test/afl/fuzzing-wrappers/server-access.sh
index cdded281..5b3e2155 100755
--- a/test/afl/fuzzing-wrappers/server-access.sh
+++ b/test/afl/fuzzing-wrappers/server-access.sh
@@ -15,8 +15,8 @@ TS=`date +"%m%d%y%H%M%S"`
 mkdir $OUT_DIR
 
 ### make sure that parsing the access.conf file works
-./fuzzing-wrappers/helpers/fwknopd-parse-access.sh || exit
+./fuzzing-wrappers/helpers/fwknopd-parse-access.sh || exit $?
 
 LD_LIBRARY_PATH=$LIB_DIR afl-fuzz -t 1000 -i $IN_DIR -o $OUT_DIR -f $OUT_DIR/afl_access.conf $SERVER -c ../conf/ipt_snat_fwknopd.conf -a $OUT_DIR/afl_access.conf -A -f -t --exit-parse-config -D
 
-exit
+exit $?
diff --git a/test/afl/fuzzing-wrappers/server-conf.sh b/test/afl/fuzzing-wrappers/server-conf.sh
index c2336dab..64f8155d 100755
--- a/test/afl/fuzzing-wrappers/server-conf.sh
+++ b/test/afl/fuzzing-wrappers/server-conf.sh
@@ -15,8 +15,8 @@ TS=`date +"%m%d%y%H%M%S"`
 mkdir $OUT_DIR
 
 ### make sure that parsing the fwknopd.conf file works
-./fuzzing-wrappers/helpers/fwknopd-parse-conf.sh || exit
+./fuzzing-wrappers/helpers/fwknopd-parse-conf.sh || exit $?
 
 LD_LIBRARY_PATH=$LIB_DIR afl-fuzz -t 1000 -i $IN_DIR -o $OUT_DIR -f $OUT_DIR/afl_fwknopd.conf $SERVER -c $OUT_DIR/afl_fwknopd.conf -a $OUT_DIR/afl_access.conf -A -f -t --exit-parse-config -D
 
-exit
+exit $?
diff --git a/test/afl/fuzzing-wrappers/spa-pkts.sh b/test/afl/fuzzing-wrappers/spa-pkts.sh
index fdf63cf4..9b920b7b 100755
--- a/test/afl/fuzzing-wrappers/spa-pkts.sh
+++ b/test/afl/fuzzing-wrappers/spa-pkts.sh
@@ -15,8 +15,8 @@ TS=`date +"%m%d%y%H%M%S"`
 mkdir $OUT_DIR
 
 ### make sure that a basic SPA packet to stdin in fwknopd -A mode works
-./fuzzing-wrappers/helpers/fwknopd-stdin-test.sh || exit
+./fuzzing-wrappers/helpers/fwknopd-stdin-test.sh || exit $?
 
 LD_LIBRARY_PATH=$LIB_DIR afl-fuzz -t 1000 -i $IN_DIR -o $OUT_DIR $SERVER -c ../conf/default_fwknopd.conf -a ../conf/default_access.conf -A -f -t
 
-exit
+exit $?