[libFuzzer] re-enable LLVMFuzzer-RepeatedMemcmp test, cleanup the test runner nearby

llvm-svn: 292683

1 files changed, 10 insertions, 7 deletions

diff --git a/llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp b/llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp
index a327bbee781..7377f65ed76 100644
--- a/llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp
+++ b/llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp
@@ -8,13 +8,16 @@
 #include <cstdlib>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-  int Matches = 0;
-  for (size_t i = 0; i + 2 < Size; i += 3) {
-    const char *Pat = i % 2 ? "foo" : "bar";
-    if (!memcmp(Data + i, Pat, 3))
-      Matches++;
-  }
-  if (Matches > 20) {
+  int Matches1 = 0;
+  for (size_t i = 0; i + 2 < Size; i += 3)
+    if (!memcmp(Data + i, "foo", 3))
+      Matches1++;
+  int Matches2 = 0;
+  for (size_t i = 0; i + 2 < Size; i += 3)
+    if (!memcmp(Data + i, "bar", 3))
+      Matches2++;
+
+  if (Matches1 > 10 && Matches2 > 10) {
     fprintf(stderr, "BINGO!\n");
     exit(1);
   }