From 2d739940466980bd07419a846e33a6b648978d40 Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Tue, 9 Jul 2019 19:28:14 +0000 Subject: [libFuzzer] Include FuzzedDataProvider.h in the test without "utils" subdir. Summary: This way the test would better match the intended usage of the header, plus it makes some additional testing (e.g. in CI) a bit easier to set up. Reviewers: morehouse Reviewed By: morehouse Subscribers: mgorny, delcypher, #sanitizers, llvm-commits Tags: #llvm, #sanitizers Differential Revision: https://reviews.llvm.org/D64440 llvm-svn: 365544 --- compiler-rt/lib/fuzzer/tests/CMakeLists.txt | 2 ++ compiler-rt/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'compiler-rt/lib/fuzzer') diff --git a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt index 69e67ab0d50..6f665107994 100644 --- a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt +++ b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt @@ -75,6 +75,8 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH) set_target_properties(FuzzerUnitTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + list(APPEND LIBFUZZER_UNITTEST_CFLAGS -I${COMPILER_RT_SOURCE_DIR}/lib/fuzzer/utils) + set(FuzzedDataProviderTestObjects) generate_compiler_rt_tests(FuzzedDataProviderTestObjects FuzzedDataProviderUnitTests "FuzzerUtils-${arch}-Test" ${arch} diff --git a/compiler-rt/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp b/compiler-rt/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp index 69a8aa4cc8b..e1b272227ff 100644 --- a/compiler-rt/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp +++ b/compiler-rt/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp @@ -6,7 +6,7 @@ #include #include -#include "utils/FuzzedDataProvider.h" +#include "FuzzedDataProvider.h" // The test is intentionally extensive, as behavior of |FuzzedDataProvider| must // not be broken, given than many fuzz targets depend on it. Changing the -- cgit v1.2.3