Merge branch 'master' of github.com:vanhauser-thc/AFLplusplus

4 files changed, 17 insertions, 5 deletions

diff --git a/Dockerfile b/Dockerfile
index 7bb60610..396954ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:eoan
 MAINTAINER David Carlier <devnexen@gmail.com>
 LABEL "about"="AFLplusplus docker image"
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get -y install \
     --no-install-suggests --no-install-recommends \
     automake \
     bison \
diff --git a/TODO b/TODO
index e935eafa..d153f1b4 100644
--- a/TODO
+++ b/TODO
@@ -7,6 +7,7 @@ Makefile:
 
 afl-fuzz:
  - sync_fuzzers(): only masters sync from all, slaves only sync from master
+ - ascii_only mode
 
 gcc_plugin:
  - laf-intel
diff --git a/test/test.sh b/test/test.sh
index 57b50eb4..1709468e 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -265,12 +265,22 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && {
     }
     test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" || {
       echo 000000000000000000000000 > in/in2
+      echo 111 > in/in3
       mkdir -p in2
-      ../afl-cmin -i in -o in2 -- ./test-instr.plain >/dev/null
-      CNT=`ls in2/ | wc -l`
+      ../afl-cmin -i in -o in2 -- ./test-instr.plain >/dev/null 2>&1 # why is afl-forkserver writing to stderr?
+      CNT=`ls in2/* 2>/dev/null | wc -l`
       case "$CNT" in
-        *1) $ECHO "$GREEN[+] afl-cmin correctly minimized the number of testcases" ;;
-        *)  $ECHO "$RED[!] afl-cmin did not correctly minimize the number of testcases"
+        *2) $ECHO "$GREEN[+] afl-cmin correctly minimized the number of testcases" ;;
+        *)  $ECHO "$RED[!] afl-cmin did not correctly minimize the number of testcases ($CNT)"
+            CODE=1
+            ;;
+      esac
+      rm -f in2/in*
+      AFL_PATH=`pwd`/.. ../afl-cmin.bash -i in -o in2 -- ./test-instr.plain >/dev/null
+      CNT=`ls in2/* 2>/dev/null | wc -l`
+      case "$CNT" in
+        *2) $ECHO "$GREEN[+] afl-cmin.bash correctly minimized the number of testcases" ;;
+        *)  $ECHO "$RED[!] afl-cmin.bash did not correctly minimize the number of testcases ($CNT)"
             CODE=1
             ;;
       esac
diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh
index 582e0669..a04cca6b 100755
--- a/unicorn_mode/build_unicorn_support.sh
+++ b/unicorn_mode/build_unicorn_support.sh
@@ -81,6 +81,7 @@ if [ "$PLT" = "FreeBSD" ]; then
   MAKECMD=gmake
   CORES=`sysctl -n hw.ncpu`
   TARCMD=gtar
+  PYTHONBIN=python3
 fi
 
 if [ "$PLT" = "NetBSD" ] || [ "$PLT" = "OpenBSD" ]; then