fix tests for sync mode
MODIFY
test/checkcommit.sh
test/checkcommit.sh
@@ -34,7 +34,7 @@ time nice -n -20 ./afl-fuzz -i "$INDIR" -s 123 -o out-profile -- $CMDLINE 2>> $C
STOP=`date +%s`
echo $STOP >> $C.out
echo RUNTIME: `expr $STOP - $START` >> $C.out
-cat out-profile/fuzzer_stats >> $C.out
+cat out-profile/default/fuzzer_stats >> $C.out
gprof ./afl-fuzz gmon.out >> $C.out
make clean >/dev/null 2>&1

MODIFY
test/test-basic.sh
test/test-basic.sh
@@ -67,7 +67,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc
{
../afl-fuzz -V10 -m ${MEM_LIMIT} -i in -o out -- ./test-instr.plain >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/queue/id:000002* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with ${AFL_GCC}"
} || {
echo CUT------------------------------------------------------------------CUT

MODIFY
test/test-custom-mutators.sh
test/test-custom-mutators.sh
-#!/bin/sh
+f#!/bin/sh
. ./test-pre.sh
@@ -43,7 +43,7 @@ test "1" = "`../afl-fuzz | grep -i 'without python' >/dev/null; echo $?`" && {
} >>errors 2>&1
# Check results
- test -n "$( ls out/crashes/id:000000* 2>/dev/null )" && { # TODO: update here
+ test -n "$( ls out/default/crashes/id:000000* 2>/dev/null )" && { # TODO: update here
$ECHO "$GREEN[+] afl-fuzz is working correctly with the C mutator"
} || {
echo CUT------------------------------------------------------------------CUT
@@ -62,7 +62,7 @@ test "1" = "`../afl-fuzz | grep -i 'without python' >/dev/null; echo $?`" && {
AFL_CUSTOM_MUTATOR_LIBRARY="./libexamplemutator.so;./libexamplemutator2.so" AFL_CUSTOM_MUTATOR_ONLY=1 ../afl-fuzz -V1 -m ${MEM_LIMIT} -i in -o out -- ./test-multiple-mutators >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/crashes/id:000000* 2>/dev/null )" && { # TODO: update here
+ test -n "$( ls out/default/crashes/id:000000* 2>/dev/null )" && { # TODO: update here
$ECHO "$GREEN[+] afl-fuzz is working correctly with multiple C mutators"
} || {
echo CUT------------------------------------------------------------------CUT
@@ -86,7 +86,7 @@ test "1" = "`../afl-fuzz | grep -i 'without python' >/dev/null; echo $?`" && {
} >>errors 2>&1
# Check results
- test -n "$( ls out/crashes/id:000000* 2>/dev/null )" && { # TODO: update here
+ test -n "$( ls out/default/crashes/id:000000* 2>/dev/null )" && { # TODO: update here
$ECHO "$GREEN[+] afl-fuzz is working correctly with the Python mutator"
} || {
echo CUT------------------------------------------------------------------CUT

MODIFY
test/test-gcc-plugin.sh
test/test-gcc-plugin.sh
@@ -66,7 +66,7 @@ test -e ../afl-gcc-fast -a -e ../afl-compiler-rt.o && {
{
../afl-fuzz -V10 -m ${MEM_LIMIT} -i in -o out -- ./test-instr.plain.gccpi >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/queue/id:000002* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with gcc_plugin"
} || {
echo CUT------------------------------------------------------------------CUT

MODIFY
test/test-llvm.sh
test/test-llvm.sh
@@ -70,7 +70,7 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && {
{
../afl-fuzz -V10 -m ${MEM_LIMIT} -i in -o out -- ./test-instr.plain >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/queue/id:000002* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with llvm_mode"
} || {
echo CUT------------------------------------------------------------------CUT
@@ -161,7 +161,7 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && {
{
AFL_BENCH_UNTIL_CRASH=1 AFL_NO_UI=1 ../afl-fuzz -s 1 -V30 -m ${MEM_LIMIT} -i in -o out -- ./test-floatingpoint >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/crashes/id:* 2>/dev/null )" && {
+ test -n "$( ls out/default/crashes/id:* 2>/dev/null )" && {
$ECHO "$GREEN[+] llvm_mode laf-intel floatingpoint splitting feature works correctly"
} || {
cat errors
@@ -195,7 +195,7 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && {
echo 0000000000000000000000000 > in/in
AFL_BENCH_UNTIL_CRASH=1 ../afl-fuzz -m none -V60 -i in -o out -c./test-cmplog -- ./test-cmplog >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/crashes/id:000000* out/hangs/id:000000* 2>/dev/null )" & {
+ test -n "$( ls out/default/crashes/id:000000* out/default/hangs/id:000000* 2>/dev/null )" & {
$ECHO "$GREEN[+] afl-fuzz is working correctly with llvm_mode cmplog"
} || {
echo CUT------------------------------------------------------------------CUT

MODIFY
test/test-performance.sh
test/test-performance.sh
@@ -87,8 +87,8 @@ test -e ../${AFL_GCC} -a -e ../afl-fuzz && {
{
../afl-fuzz -V 30 -s 123 -m ${MEM_LIMIT} -i in -o out-gcc -- ./test-instr.plain
} >>errors 2>&1
- test -n "$( ls out-gcc/queue/id:000002* 2> /dev/null )" && {
- GCC=`grep execs_done out-gcc/fuzzer_stats | awk '{print$3}'`
+ test -n "$( ls out-gcc/default/queue/id:000002* 2> /dev/null )" && {
+ GCC=`grep execs_done out-gcc/default/fuzzer_stats | awk '{print$3}'`
} || {
echo CUT----------------------------------------------------------------
cat errors
@@ -111,8 +111,8 @@ test -e ../afl-clang-fast -a -e ../afl-fuzz && {
{
../afl-fuzz -V 30 -s 123 -m ${MEM_LIMIT} -i in -o out-llvm -- ./test-instr.llvm
} >>errors 2>&1
- test -n "$( ls out-llvm/queue/id:000002* 2> /dev/null )" && {
- LLVM=`grep execs_done out-llvm/fuzzer_stats | awk '{print$3}'`
+ test -n "$( ls out-llvm/default/queue/id:000002* 2> /dev/null )" && {
+ LLVM=`grep execs_done out-llvm/default/fuzzer_stats | awk '{print$3}'`
} || {
echo CUT----------------------------------------------------------------
cat errors
@@ -135,8 +135,8 @@ test -e ../afl-gcc-fast -a -e ../afl-fuzz && {
{
../afl-fuzz -V 30 -s 123 -m ${MEM_LIMIT} -i in -o out-gccp -- ./test-instr.gccp
} >>errors 2>&1
- test -n "$( ls out-gccp/queue/id:000002* 2> /dev/null )" && {
- GCCP=`grep execs_done out-gccp/fuzzer_stats | awk '{print$3}'`
+ test -n "$( ls out-gccp/default/queue/id:000002* 2> /dev/null )" && {
+ GCCP=`grep execs_done out-gccp/default/fuzzer_stats | awk '{print$3}'`
} || {
echo CUT----------------------------------------------------------------
cat errors
@@ -159,8 +159,8 @@ test -e ../afl-qemu-trace -a -e ../afl-fuzz && {
{
../afl-fuzz -Q -V 30 -s 123 -m ${MEM_LIMIT} -i in -o out-qemu -- ./test-instr.qemu
} >>errors 2>&1
- test -n "$( ls out-qemu/queue/id:000002* 2> /dev/null )" && {
- QEMU=`grep execs_done out-qemu/fuzzer_stats | awk '{print$3}'`
+ test -n "$( ls out-qemu/default/queue/id:000002* 2> /dev/null )" && {
+ QEMU=`grep execs_done out-qemu/default/fuzzer_stats | awk '{print$3}'`
} || {
echo CUT----------------------------------------------------------------
echo ../afl-fuzz -Q -V 30 -s 123 -m ${MEM_LIMIT} -i in -o out-qemu -- ./test-instr.qemu

MODIFY
test/test-qemu-mode.sh
test/test-qemu-mode.sh
@@ -14,9 +14,9 @@ test -e ../afl-qemu-trace && {
{
../afl-fuzz -m ${MEM_LIMIT} -V10 -Q -i in -o out -- ./test-instr >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/queue/id:000002* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with qemu_mode"
- RUNTIME=`grep execs_done out/fuzzer_stats | awk '{print$3}'`
+ RUNTIME=`grep execs_done out/default/fuzzer_stats | awk '{print$3}'`
} || {
echo CUT------------------------------------------------------------------CUT
cat errors
@@ -42,9 +42,9 @@ test -e ../afl-qemu-trace && {
unset AFL_ENTRYPOINT
} >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/queue/id:000001* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000001* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with qemu_mode AFL_ENTRYPOINT"
- RUNTIME=`grep execs_done out/fuzzer_stats | awk '{print$3}'`
+ RUNTIME=`grep execs_done out/default/fuzzer_stats | awk '{print$3}'`
} || {
echo CUT------------------------------------------------------------------CUT
cat errors
@@ -64,7 +64,7 @@ test -e ../afl-qemu-trace && {
unset AFL_PRELOAD
unset AFL_COMPCOV_LEVEL
} >>errors 2>&1
- test -n "$( ls out/queue/id:000001* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000001* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with qemu_mode compcov"
} || {
echo CUT------------------------------------------------------------------CUT
@@ -87,7 +87,7 @@ test -e ../afl-qemu-trace && {
{
../afl-fuzz -m none -V10 -Q -c 0 -i in -o out -- ./test-compcov >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/queue/id:000001* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000001* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with qemu_mode cmplog"
} || {
echo CUT------------------------------------------------------------------CUT
@@ -119,9 +119,9 @@ test -e ../afl-qemu-trace && {
../afl-fuzz -m ${MEM_LIMIT} -V10 -Q -i in -o out -- ./test-instr
unset AFL_QEMU_PERSISTENT_ADDR
} >>errors 2>&1
- test -n "$( ls out/queue/id:000002* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with persistent qemu_mode"
- RUNTIMEP=`grep execs_done out/fuzzer_stats | awk '{print$3}'`
+ RUNTIMEP=`grep execs_done out/default/fuzzer_stats | awk '{print$3}'`
test -n "$RUNTIME" -a -n "$RUNTIMEP" && {
DIFF=`expr $RUNTIMEP / $RUNTIME`
test "$DIFF" -gt 1 && { # must be at least twice as fast

MODIFY
test/test-unicorn-mode.sh
test/test-unicorn-mode.sh
@@ -35,7 +35,7 @@ test -d ../unicorn_mode/unicornafl -a -e ../unicorn_mode/unicornafl/samples/shel
make >>errors 2>&1
$ECHO "$GREY[*] running afl-fuzz for unicorn_mode (persistent), this will take approx 25 seconds"
AFL_DEBUG_CHILD_OUTPUT=1 ../../../afl-fuzz -m none -V25 -U -i sample_inputs -o out -d -- ./harness @@ >>errors 2>&1
- test -n "$( ls out/queue/id:000002* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with unicorn_mode (persistent)"
} || {
echo CUT------------------------------------------------------------------CUT
@@ -63,7 +63,7 @@ test -d ../unicorn_mode/unicornafl -a -e ../unicorn_mode/unicornafl/samples/shel
{
../afl-fuzz -m ${MEM_LIMIT} -V25 -U -i in -o out -d -- "$PY" ../unicorn_mode/samples/simple/simple_test_harness.py @@ >>errors 2>&1
} >>errors 2>&1
- test -n "$( ls out/queue/id:000002* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with unicorn_mode"
} || {
echo CUT------------------------------------------------------------------CUT
@@ -83,7 +83,7 @@ test -d ../unicorn_mode/unicornafl -a -e ../unicorn_mode/unicornafl/samples/shel
../afl-fuzz -m ${MEM_LIMIT} -V35 -U -i in -o out -d -- "$PY" ../unicorn_mode/samples/compcov_x64/compcov_test_harness.py @@ >>errors 2>&1
unset AFL_COMPCOV_LEVEL
} >>errors 2>&1
- test -n "$( ls out/queue/id:000001* 2>/dev/null )" && {
+ test -n "$( ls out/default/queue/id:000001* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with unicorn_mode compcov"
} || {
echo CUT------------------------------------------------------------------CUT

fix tests for sync mode