diff options
Diffstat (limited to 'lib/fuzzer/tests')
| -rw-r--r-- | lib/fuzzer/tests/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lib/fuzzer/tests/FuzzerUnittest.cpp | 7 | 
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/fuzzer/tests/CMakeLists.txt b/lib/fuzzer/tests/CMakeLists.txt index ed5807168301..6abb72def3e1 100644 --- a/lib/fuzzer/tests/CMakeLists.txt +++ b/lib/fuzzer/tests/CMakeLists.txt @@ -1,3 +1,5 @@ +include(CompilerRTCompile) +  set(LIBFUZZER_UNITTEST_CFLAGS    ${COMPILER_RT_UNITTEST_CFLAGS}    ${COMPILER_RT_GTEST_CFLAGS} @@ -17,12 +19,12 @@ list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS --driver-mode=g++)  if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")    list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS -lc++ -lpthread) -else() +elseif(NOT WIN32)    list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS -lstdc++ -lpthread)  endif()  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND COMPILER_RT_LIBCXX_PATH) -  list(APPEND LIBFUZZER_UNITTEST_CFLAGS -nostdinc++ -D_LIBCPP_ABI_VERSION=Fuzzer) +  list(APPEND LIBFUZZER_UNITTEST_CFLAGS -nostdinc++)  endif()  if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH) @@ -45,7 +47,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH)    if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND COMPILER_RT_LIBCXX_PATH)      set(LIBFUZZER_TEST_RUNTIME_DEPS libcxx_fuzzer_${arch}-build) -    set(LIBFUZZER_TEST_RUNTIME_CFLAGS -isystem ${COMPILER_RT_LIBCXX_PATH}/include) +    set(LIBFUZZER_TEST_RUNTIME_CFLAGS -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1)      set(LIBFUZZER_TEST_RUNTIME_LINK_FLAGS ${LIBCXX_${arch}_PREFIX}/lib/libc++.a)    endif() diff --git a/lib/fuzzer/tests/FuzzerUnittest.cpp b/lib/fuzzer/tests/FuzzerUnittest.cpp index e3b06702603d..7cdd44582329 100644 --- a/lib/fuzzer/tests/FuzzerUnittest.cpp +++ b/lib/fuzzer/tests/FuzzerUnittest.cpp @@ -34,6 +34,13 @@ TEST(Fuzzer, Basename) {    EXPECT_EQ(Basename("/bar"), "bar");    EXPECT_EQ(Basename("foo/x"), "x");    EXPECT_EQ(Basename("foo/"), ""); +#if LIBFUZZER_WINDOWS +  EXPECT_EQ(Basename("foo\\bar"), "bar"); +  EXPECT_EQ(Basename("foo\\bar/baz"), "baz"); +  EXPECT_EQ(Basename("\\bar"), "bar"); +  EXPECT_EQ(Basename("foo\\x"), "x"); +  EXPECT_EQ(Basename("foo\\"), ""); +#endif  }  TEST(Fuzzer, CrossOver) {  | 
