4 files changed, 4 insertions, 2 deletions
diff --git a/test/test.sh b/test/test.sh
index b8d4208f..90633a9f 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -81,7 +81,7 @@ test `uname -s` = 'Darwin' -o `uname -s` = 'FreeBSD' && {
 } || {
   AFL_GCC=afl-gcc
 }
-command -v gcc || AFL_GCC=afl-clang
+command -v gcc >/dev/null 2>&1 || AFL_GCC=afl-clang
 
 SYS=`uname -m`
 
@@ -802,7 +802,6 @@ test -e ../afl-qemu-trace && {
           echo CUT------------------------------------------------------------------CUT
           $ECHO "$RED[!] afl-fuzz is not working correctly with persistent qemu_mode"
           CODE=1
-          exit 1
         }
         rm -rf in out errors
       } || {
diff --git a/test/unittests/unit_list.c b/test/unittests/unit_list.c
index df4864e4..86d4748b 100644
--- a/test/unittests/unit_list.c
+++ b/test/unittests/unit_list.c
@@ -33,6 +33,7 @@ void __wrap_exit(int status) {
 }
 
 /* ignore all printfs */
+#undef printf
 extern int printf(const char *format, ...);
 extern int __real_printf(const char *format, ...);
 int __wrap_printf(const char *format, ...);
diff --git a/test/unittests/unit_maybe_alloc.c b/test/unittests/unit_maybe_alloc.c
index 8cd8b11a..4e093cfe 100644
--- a/test/unittests/unit_maybe_alloc.c
+++ b/test/unittests/unit_maybe_alloc.c
@@ -33,6 +33,7 @@ void __wrap_exit(int status) {
 
 int __wrap_printf(const char *format, ...);
 /* ignore all printfs */
+#undef printf
 extern int printf(const char *format, ...);
 extern int __real_printf(const char *format, ...);
 int __wrap_printf(const char *format, ...) {
diff --git a/test/unittests/unit_preallocable.c b/test/unittests/unit_preallocable.c
index 8d619b78..888bb485 100644
--- a/test/unittests/unit_preallocable.c
+++ b/test/unittests/unit_preallocable.c
@@ -33,6 +33,7 @@ void __wrap_exit(int status) {
 }
 
 /* ignore all printfs */
+#undef printf
 extern int printf(const char *format, ...);
 extern int __real_printf(const char *format, ...);
 int __wrap_printf(const char *format, ...);