From 2f7edaeb3965e1f80dc37ae64090a2b41a6208b1 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Tue, 15 May 2018 01:15:47 +0000 Subject: [PATCH] [libFuzzer] deprecate equivalence_server llvm-svn: 332316 --- compiler-rt/lib/fuzzer/FuzzerDriver.cpp | 2 ++ compiler-rt/lib/fuzzer/FuzzerFlags.def | 4 ++-- compiler-rt/test/fuzzer/equivalence-signals.test | 1 + compiler-rt/test/fuzzer/equivalence.test | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp index 68f164f..4f14373 100644 --- a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp +++ b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp @@ -663,6 +663,7 @@ int FuzzerDriver(int *argc, char ***argv, UserCallback Callback) { if (Flags.cleanse_crash) return CleanseCrashInput(Args, Options); +#if 0 // deprecated, to be removed. if (auto Name = Flags.run_equivalence_server) { SMR.Destroy(Name); if (!SMR.Create(Name)) { @@ -688,6 +689,7 @@ int FuzzerDriver(int *argc, char ***argv, UserCallback Callback) { } Printf("INFO: EQUIVALENCE CLIENT UP\n"); } +#endif if (DoPlainRun) { Options.SaveArtifacts = false; diff --git a/compiler-rt/lib/fuzzer/FuzzerFlags.def b/compiler-rt/lib/fuzzer/FuzzerFlags.def index 1ba086f..64bd362 100644 --- a/compiler-rt/lib/fuzzer/FuzzerFlags.def +++ b/compiler-rt/lib/fuzzer/FuzzerFlags.def @@ -144,8 +144,8 @@ FUZZER_FLAG_INT(ignore_remaining_args, 0, "If 1, ignore all arguments passed " "after this one. Useful for fuzzers that need to do their own " "argument parsing.") -FUZZER_FLAG_STRING(run_equivalence_server, "Experimental") -FUZZER_FLAG_STRING(use_equivalence_server, "Experimental") +FUZZER_DEPRECATED_FLAG(run_equivalence_server) +FUZZER_DEPRECATED_FLAG(use_equivalence_server) FUZZER_FLAG_INT(analyze_dict, 0, "Experimental") FUZZER_DEPRECATED_FLAG(use_clang_coverage) FUZZER_FLAG_INT(use_feature_frequency, 0, "Experimental/internal") diff --git a/compiler-rt/test/fuzzer/equivalence-signals.test b/compiler-rt/test/fuzzer/equivalence-signals.test index b9a5103..1da66f1 100644 --- a/compiler-rt/test/fuzzer/equivalence-signals.test +++ b/compiler-rt/test/fuzzer/equivalence-signals.test @@ -1,3 +1,4 @@ +REQUIRES: this-test-is-deprecated # Run EquivalenceATest against itself with a small timeout # to stress the signal handling and ensure that shmem doesn't mind # the signals. diff --git a/compiler-rt/test/fuzzer/equivalence.test b/compiler-rt/test/fuzzer/equivalence.test index 00155bc..2438811 100644 --- a/compiler-rt/test/fuzzer/equivalence.test +++ b/compiler-rt/test/fuzzer/equivalence.test @@ -1,3 +1,4 @@ +REQUIRES: this-test-is-deprecated UNSUPPORTED: freebsd RUN: %cpp_compiler %S/EquivalenceATest.cpp -o %t-EquivalenceATest RUN: %cpp_compiler %S/EquivalenceBTest.cpp -o %t-EquivalenceBTest -- 2.7.4