afl-cmin more awk portability (mawk), add afl-cmin/afl-tmin tests

for non-x86 platforms

2 files changed, 31 insertions, 22 deletions

diff --git a/afl-cmin b/afl-cmin
index a072a62a..de5a66ed 100755
--- a/afl-cmin
+++ b/afl-cmin
@@ -8,6 +8,10 @@ awk -f - -- ${@+"$@"} <<'EOF'
 #
 # based on afl-cmin bash script written by Michal Zalewski
 # rewritten by Heiko Eißfeldt (hexcoder-)
+# tested with:
+#   gnu awk (x86 Linux)
+#   bsd awk (x86 *BSD)
+#   mawk (arm32 raspbian)
 #
 # uses getopt.awk package from Arnold Robbins
 #
@@ -52,7 +56,7 @@ function getopt(argc, argv, options,    thisopt, i)
         Optind++
         _opti = 0
         return -1
-    } else if (argv[Optind] !~ /^-[^:[:space:]]/) {
+    } else if (argv[Optind] !~ /^-[^:\t ]/) {
         _opti = 0
         return -1
     }
@@ -88,22 +92,6 @@ function getopt(argc, argv, options,    thisopt, i)
     return thisopt
 }
 
-BEGIN {
-    Opterr = 1    # default is to diagnose
-    Optind = 1    # skip ARGV[0]
-
-    # test program
-    if (_getopt_test) {
-        while ((_go_c = getopt(ARGC, ARGV, "ab:cd")) != -1)
-            printf("c = <%c>, Optarg = <%s>\n",
-                                       _go_c, Optarg)
-        printf("non-option arguments:\n")
-        for (; Optind < ARGC; Optind++)
-            printf("\tARGV[%d] = <%s>\n",
-                                    Optind, ARGV[Optind])
-    }
-}
-
 function usage() {
    print \
 "Usage: afl-cmin [ options ] -- /path/to/target_app [ ... ]\n" \
@@ -311,7 +299,7 @@ BEGIN {
   }
 
   if (!ENVIRON["AFL_PATH"]) {
-    if (0 == system("test -f afl-cmin.awk")) {
+    if (0 == system("test -f afl-cmin")) {
       showmap = "./afl-showmap"
     } else {
       "which afl-showmap 2>/dev/null" | getline showmap
@@ -336,7 +324,8 @@ BEGIN {
   } else {
     stat_format = "-f '%z %N'" # *BSD, MacOS
   }
-  while ("cd "in_dir" && find . -type f -exec stat "stat_format" \\{\\} \\; | sort -n | cut -d' ' -f2-" | getline) {
+  cmdline = "cd "in_dir" && find . -type f -exec stat "stat_format" \\{\\} \\; | sort -n | cut -d' ' -f2-"
+  while (cmdline | getline) {
     infilesSmallToBig[i++] = $0
   }
   in_count = i
diff --git a/test/test.sh b/test/test.sh
index 3473155f..93a4e008 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -153,8 +153,8 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" && {
     ../afl-cmin -i in -o in2 -- ./test-instr.plain > /dev/null
     CNT=`ls in2/ | wc -l`
     case "$CNT" in
-1| *1) $ECHO "$GREEN[+] afl-cmin correctly minimized testcase numbers" ;;
-*) $ECHO "$RED[!] afl-cmin did not correctly minimize testcase numbers"
+1| *1) $ECHO "$GREEN[+] afl-cmin correctly minimized the number of testcases" ;;
+*) $ECHO "$RED[!] afl-cmin did not correctly minimizethe  number of testcases"
        CODE=1
        ;;
     esac
@@ -176,7 +176,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" && {
  $ECHO "$YELLOW[-] not an intel platform, cannot test afl-gcc"
 } 
 
-$ECHO "$BLUE[*] Testing: llvm_mode"
+$ECHO "$BLUE[*] Testing: llvm_mode, afl-showmap, afl-fuzz, afl-cmin and afl-tmin"
 test -e ../afl-clang-fast -a -e ../split-switches-pass.so && {
   # on FreeBSD need to set AFL_CC
   test `uname -s` = 'FreeBSD' && {
@@ -253,6 +253,26 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && {
       $ECHO "$RED[!] afl-fuzz is not working correctly with llvm_mode"
       CODE=1
     }
+    test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" || {
+      echo 000000000000000000000000 > in/in2
+      mkdir -p in2
+      ../afl-cmin -i in -o in2 -- ./test-instr.plain > /dev/null
+      CNT=`ls in2/ | wc -l`
+      case "$CNT" in
+1| *1) $ECHO "$GREEN[+] afl-cmin correctly minimized the number of testcases" ;;
+*) $ECHO "$RED[!] afl-cmin did not correctly minimize the number of testcases"
+         CODE=1
+         ;;
+      esac
+      ../afl-tmin -i in/in2 -o in2/in2 -- ./test-instr.plain > /dev/null 2>&1
+      SIZE=`ls -l in2/in2 2> /dev/null | awk '{print$5}'`
+      test "$SIZE" = 1 && $ECHO "$GREEN[+] afl-tmin correctly minimized the testcase"
+      test "$SIZE" = 1 || {
+         $ECHO "$RED[!] afl-tmin did incorrectly minimize the testcase to $SIZE"
+         CODE=1
+      }
+      rm -rf in2
+    }
     rm -rf in out errors
   }
   rm -f test-instr.plain