about summary refs log tree commit diff
path: root/test
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-08-17 23:42:45 +0200
committerGitHub <noreply@github.com>2020-08-17 23:42:45 +0200
commit0a6084f3613f15d2508d43334d28e671f5c6c573 (patch)
treea58da1d2ed34cef4020c1fccbd70c4679d7e59fb /test
parent8044ae28be2dd109ac16719ce2e304074fa74efd (diff)
parent9532499ef5280ae4c7aa3d189dd7a924a38e8358 (diff)
downloadafl++-0a6084f3613f15d2508d43334d28e671f5c6c573.tar.gz
Merge pull request #499 from AFLplusplus/dev
important push to stable
Diffstat (limited to 'test')
-rwxr-xr-xtest/test-basic.sh6
-rwxr-xr-xtest/test-post.sh2
-rwxr-xr-xtest/test-pre.sh1
3 files changed, 5 insertions, 4 deletions
diff --git a/test/test-basic.sh b/test/test-basic.sh
index 9e4b03c3..06c40efe 100755
--- a/test/test-basic.sh
+++ b/test/test-basic.sh
@@ -99,8 +99,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc
             ;;
         esac
     } else {
-      $ECHO "$YELLOW[-] no bash available, cannot test afl-cmin.bash"
-      INCOMPLETE=1
+      $ECHO "$GRAY[*] no bash available, cannot test afl-cmin.bash"
     }
     fi
     ../afl-tmin -m ${MEM_LIMIT} -i in/in2 -o in2/in2 -- ./test-instr.plain > /dev/null 2>&1
@@ -119,8 +118,9 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc
   INCOMPLETE=1
  }
 } || {
- $ECHO "$YELLOW[-] not an intel platform, cannot test afl-gcc"
+ $ECHO "$GREY[[*] not an intel platform, skipped tests of afl-gcc"
  #this is not incomplete as this feature doesnt exist, so all good
+ AFL_TEST_COUNT=$((AFL_TEST_COUNT-1))
 }
 
 . ./test-post.sh
diff --git a/test/test-post.sh b/test/test-post.sh
index c1e22498..0911e2cd 100755
--- a/test/test-post.sh
+++ b/test/test-post.sh
@@ -4,7 +4,7 @@ AFL_TEST_DEPTH=$((AFL_TEST_DEPTH-1))
 if [ $AFL_TEST_DEPTH = 0 ]; then
 # All runs done :)
 
-$ECHO "$GREY[*] all test cases completed.$RESET"
+$ECHO "$GREY[*] $AFL_TEST_COUNT test cases completed.$RESET"
 test "$INCOMPLETE" = "0" && $ECHO "$GREEN[+] all test cases executed"
 test "$INCOMPLETE" = "1" && $ECHO "$YELLOW[-] not all test cases were executed"
 test "$CODE" = "0" && $ECHO "$GREEN[+] all tests were successful :-)$RESET"
diff --git a/test/test-pre.sh b/test/test-pre.sh
index 3e2d475d..e3393962 100755
--- a/test/test-pre.sh
+++ b/test/test-pre.sh
@@ -4,6 +4,7 @@
 # They may set an error code with $CODE=1
 # If tests are incomplete, they may set $INCOMPLETE=1
 
+AFL_TEST_COUNT=$((AFL_TEST_COUNT+1))
 AFL_TEST_DEPTH=$((AFL_TEST_DEPTH+1))
 
 if [ $AFL_TEST_DEPTH = 1 ]; then