Merge branch 'unicornafl' of https://github.com/domenukk/AFLplusplus into unicornafl

3 files changed, 7 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 604e4f76..1e653a08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ afl-whatsup.8
 qemu_mode/libcompcov/compcovtest
 as
 qemu_mode/qemu-*
+core\.*
diff --git a/test/test.sh b/test/test.sh
index 64c76758..7b3b2046 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -555,6 +555,12 @@ test -d ../unicorn_mode/unicorn && {
       mkdir -p in
       echo 0 > in/in
       $ECHO "$GREY[*] Using python binary $PY"
+      $ECHO "$GREY[*] emulating one input in unicornafl"
+      $PY ../unicorn_mode/samples/simple/simple_test_harness.py ../unicorn_mode/samples/simple/sample_inputs/sample1.bin
+      $ECHO "$GREY[*] emulating a single fuzz test in unicorn_mode"
+      AFL_NO_UI=1 AFL_BENCH_UNTIL_CRASH=1 AFL_BENCH_JUST_ONE=1 AFL_DEBUG_CHILD_OUTPUT=1 ../afl-fuzz -U -i in -o out -d -- "$PY" ../unicorn_mode/samples/simple/simple_test_harness.py @@
+      $ECHO "$GREEN[*] if you saw UC returned Error: above, everything worked fine - afl unicorn found the crash. :)"
+
       $ECHO "$GREY[*] running afl-fuzz for unicorn_mode, this will take approx 25 seconds"
       {
         ../afl-fuzz -V25 -U -i in -o out -d -- "$PY" ../unicorn_mode/samples/simple/simple_test_harness.py @@ >>errors 2>&1
diff --git a/unicorn_mode/unicorn b/unicorn_mode/unicorn
-Subproject 8537b5049cb52708b40c1c53592c1240efa160f
+Subproject 3dffda817e6dd3c2bc7145795dafdd358674862