[compiler-rt] r365544 - [libFuzzer] Include FuzzedDataProvider.h in the test without "utils" subdir.

[Max Moroz via llvm-commits]

Author: dor1s
Date: Tue Jul  9 12:28:14 2019
New Revision: 365544

URL: http://llvm.org/viewvc/llvm-project?rev=365544&view=rev
Log:
[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

Modified:
    compiler-rt/trunk/lib/fuzzer/tests/CMakeLists.txt
    compiler-rt/trunk/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp

Modified: compiler-rt/trunk/lib/fuzzer/tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/fuzzer/tests/CMakeLists.txt?rev=365544&r1=365543&r2=365544&view=diff
==============================================================================
--- compiler-rt/trunk/lib/fuzzer/tests/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/fuzzer/tests/CMakeLists.txt Tue Jul  9 12:28:14 2019
@@ -75,6 +75,8 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LI
   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}

Modified: compiler-rt/trunk/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp?rev=365544&r1=365543&r2=365544&view=diff
==============================================================================
--- compiler-rt/trunk/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp (original)
+++ compiler-rt/trunk/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp Tue Jul  9 12:28:14 2019
@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <cstdlib>
 
-#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