From ae7df1ca4db5643faae83d7d69d386ab12ea75a2 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Tue, 28 Jul 2015 01:25:00 +0000 Subject: [PATCH] [libFuzzer] ensure that the dfsan tracing hooks actually run (using -verbosity=3 in tests) llvm-svn: 243365 --- llvm/lib/Fuzzer/FuzzerTraceState.cpp | 3 ++- llvm/lib/Fuzzer/test/fuzzer-dfsan.test | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/llvm/lib/Fuzzer/FuzzerTraceState.cpp b/llvm/lib/Fuzzer/FuzzerTraceState.cpp index 889519d..60524a9 100644 --- a/llvm/lib/Fuzzer/FuzzerTraceState.cpp +++ b/llvm/lib/Fuzzer/FuzzerTraceState.cpp @@ -287,7 +287,8 @@ void TraceState::DFSanCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, if (Options.Verbosity >= 3) - Printf("DFSAN: PC %lx S %zd T %zd A1 %llx A2 %llx R %d L1 %d L2 %d MU %zd\n", + Printf("DFSanCmpCallback: PC %lx S %zd T %zd A1 %llx A2 %llx R %d L1 %d L2 " + "%d MU %zd\n", PC, CmpSize, CmpType, Arg1, Arg2, Res, L1, L2, Mutations.size()); } diff --git a/llvm/lib/Fuzzer/test/fuzzer-dfsan.test b/llvm/lib/Fuzzer/test/fuzzer-dfsan.test index 7802e61..c8dac94 100644 --- a/llvm/lib/Fuzzer/test/fuzzer-dfsan.test +++ b/llvm/lib/Fuzzer/test/fuzzer-dfsan.test @@ -1,6 +1,9 @@ CHECK: BINGO +CHECK_DFSanCmpCallback: DFSanCmpCallback: PC RUN: not LLVMFuzzer-SimpleCmpTest-DFSan -use_traces=1 -seed=1 -runs=1000000 -timeout=5 2>&1 | FileCheck %s +RUN: LLVMFuzzer-SimpleCmpTest-DFSan -use_traces=1 -seed=1 -runs=100 -timeout=5 -verbosity=3 2>&1 | FileCheck %s -check-prefix=CHECK_DFSanCmpCallback RUN: not LLVMFuzzer-MemcmpTest-DFSan -use_traces=1 -seed=1 -runs=100 -timeout=5 2>&1 | FileCheck %s +RUN: LLVMFuzzer-MemcmpTest-DFSan -use_traces=1 -seed=1 -runs=2 -timeout=5 -verbosity=3 2>&1 | FileCheck %s -check-prefix=CHECK_DFSanCmpCallback -- 2.7.4