Commit 2656ecd2 authored by Jonathan Metzman's avatar Jonathan Metzman Committed by Commit Bot

[libFuzzer][Windows] Fix for ToT Clang bot

Don't allow building of afl_driver since it isn't intended to be built
on Windows.

Change-Id: I8aeb89b5cf98f1998258847b60a8e12a465d3ca9
Bug: 903078
Reviewed-on: https://chromium-review.googlesource.com/c/1342772
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Reviewed-by: default avatarMax Moroz <mmoroz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609949}
parent 1ce4b50b
...@@ -724,11 +724,17 @@ group("gn_all") { ...@@ -724,11 +724,17 @@ group("gn_all") {
(is_win && (use_drfuzz || use_libfuzzer)) || (use_libfuzzer && is_mac)) { (is_win && (use_drfuzz || use_libfuzzer)) || (use_libfuzzer && is_mac)) {
deps += [ deps += [
"//testing/libfuzzer/fuzzers", "//testing/libfuzzer/fuzzers",
"//testing/libfuzzer/tests:libfuzzer_tests",
"//third_party/icu/fuzzers", "//third_party/icu/fuzzers",
"//third_party/qcms:fuzzers", "//third_party/qcms:fuzzers",
"//third_party/zlib/contrib/tests/fuzzers", "//third_party/zlib/contrib/tests/fuzzers",
] ]
# TODO(crbug.com/906751): Get the libFuzzer tests working on Windows.
# Disable them for now becaue they cause the Windows clang ToT builder to
# fail.
if (!is_win) {
deps += [ "//testing/libfuzzer/tests:libfuzzer_tests" ]
}
} }
if (enable_nacl) { if (enable_nacl) {
......
...@@ -7,26 +7,30 @@ ...@@ -7,26 +7,30 @@
import("//testing/test.gni") import("//testing/test.gni")
import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/libfuzzer/fuzzer_test.gni")
test("libfuzzer_tests") { # TODO(crbug.com/906751): Get the tests working on Windows. Disable them for now
sources = [ # becaue they cause the Windows clang ToT builder to fail.
"fuzzer_launcher_test.cc", if (!is_win) {
] test("libfuzzer_tests") {
deps = [ sources = [
":test_config_and_dict", "fuzzer_launcher_test.cc",
":test_config_and_seed_corpus", ]
":test_config_and_seed_corpuses", deps = [
":test_config_only", ":test_config_and_dict",
":test_dict_from_subdir", ":test_config_and_seed_corpus",
":test_dict_only", ":test_config_and_seed_corpuses",
"//base", ":test_config_only",
"//testing/gmock", ":test_dict_from_subdir",
"//testing/gtest", ":test_dict_only",
"//testing/gtest:gtest_main", "//base",
] "//testing/gmock",
data_deps = [ "//testing/gtest",
":check_fuzzer_config", "//testing/gtest:gtest_main",
":check_seed_corpus_archive", ]
] data_deps = [
":check_fuzzer_config",
":check_seed_corpus_archive",
]
}
} }
fuzzer_test("test_dict_only") { fuzzer_test("test_dict_only") {
......
...@@ -50,11 +50,13 @@ source_set("libfuzzer") { ...@@ -50,11 +50,13 @@ source_set("libfuzzer") {
configs += fuzzing_engine_add_configs configs += fuzzing_engine_add_configs
} }
source_set("afl_driver") { if (use_afl) {
sources = [ source_set("afl_driver") {
"src/afl/afl_driver.cpp", sources = [
] "src/afl/afl_driver.cpp",
]
configs -= fuzzing_engine_remove_configs
configs += fuzzing_engine_add_configs configs -= fuzzing_engine_remove_configs
configs += fuzzing_engine_add_configs
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment