[libFuzzer] fix -error_exitcode=N, now with a test

llvm-svn: 285958
This commit is contained in:
Kostya Serebryany 2016-11-03 19:31:18 +00:00
parent 609d85155e
commit 8a56917492
4 changed files with 9 additions and 6 deletions

View File

@ -240,8 +240,9 @@ The most important command line options are:
The limit is checked in a separate thread every second. The limit is checked in a separate thread every second.
If running w/o ASAN/MSAN, you may use 'ulimit -v' instead. If running w/o ASAN/MSAN, you may use 'ulimit -v' instead.
``-timeout_exitcode`` ``-timeout_exitcode``
Exit code (default 77) to emit when terminating due to timeout, when Exit code (default 77) used if libFuzzer reports a timeout.
``-abort_on_timeout`` is not set. ``-error_exitcode``
Exit code (default 77) used if libFuzzer itself (not a sanitizer) reports a bug (leak, OOM, etc).
``-max_total_time`` ``-max_total_time``
If positive, indicates the maximum total time in seconds to run the fuzzer. If positive, indicates the maximum total time in seconds to run the fuzzer.
If 0 (the default), run indefinitely. If 0 (the default), run indefinitely.

View File

@ -390,6 +390,7 @@ int FuzzerDriver(int *argc, char ***argv, UserCallback Callback) {
Options.Verbosity = Flags.verbosity; Options.Verbosity = Flags.verbosity;
Options.MaxLen = Flags.max_len; Options.MaxLen = Flags.max_len;
Options.UnitTimeoutSec = Flags.timeout; Options.UnitTimeoutSec = Flags.timeout;
Options.ErrorExitCode = Flags.error_exitcode;
Options.TimeoutExitCode = Flags.timeout_exitcode; Options.TimeoutExitCode = Flags.timeout_exitcode;
Options.MaxTotalTimeSec = Flags.max_total_time; Options.MaxTotalTimeSec = Flags.max_total_time;
Options.DoCrossOver = Flags.cross_over; Options.DoCrossOver = Flags.cross_over;

View File

@ -27,10 +27,10 @@ FUZZER_FLAG_INT(
timeout, 1200, timeout, 1200,
"Timeout in seconds (if positive). " "Timeout in seconds (if positive). "
"If one unit runs more than this number of seconds the process will abort.") "If one unit runs more than this number of seconds the process will abort.")
FUZZER_FLAG_INT(timeout_exitcode, 77, FUZZER_FLAG_INT(error_exitcode, 77, "When libFuzzer itself reports a bug "
"Unless abort_on_timeout is set, use this exitcode on timeout.") "this exit code will be used.")
FUZZER_FLAG_INT(error_exit_code, 77, "When libFuzzer's signal handlers are in " FUZZER_FLAG_INT(timeout_exitcode, 77, "When libFuzzer reports a timeout "
"use exit with this exitcode after catching a deadly signal.") "this exit code will be used.")
FUZZER_FLAG_INT(max_total_time, 0, "If positive, indicates the maximal total " FUZZER_FLAG_INT(max_total_time, 0, "If positive, indicates the maximal total "
"time in seconds to run the fuzzer.") "time in seconds to run the fuzzer.")
FUZZER_FLAG_INT(help, 0, "Print help.") FUZZER_FLAG_INT(help, 0, "Print help.")

View File

@ -32,3 +32,4 @@ LEAK_TIMEOUT-NOT: LeakSanitizer
RUN: LLVMFuzzer-AccumulateAllocationsTest -detect_leaks=1 -runs=100000 2>&1 | FileCheck %s --check-prefix=ACCUMULATE_ALLOCS RUN: LLVMFuzzer-AccumulateAllocationsTest -detect_leaks=1 -runs=100000 2>&1 | FileCheck %s --check-prefix=ACCUMULATE_ALLOCS
ACCUMULATE_ALLOCS: INFO: libFuzzer disabled leak detection after every mutation ACCUMULATE_ALLOCS: INFO: libFuzzer disabled leak detection after every mutation
RUN: LLVMFuzzer-LeakTest -error_exitcode=0