diff options
author | Vitaly Buka <vitalybuka@google.com> | 2017-11-01 00:55:52 +0000 |
---|---|---|
committer | Vitaly Buka <vitalybuka@google.com> | 2017-11-01 00:55:52 +0000 |
commit | b3c355d3c87d2ea131fd71836d848fe5aa89d20d (patch) | |
tree | 9ed0aedf85f44e9450071be2ac31c28f4a60a1e4 /test/fuzzer | |
parent | 142775ac8314b5a2accfb9832e7226856deddbe9 (diff) |
Revert "[fuzzer] Fix threaded stack printing and nested mallocs"
Fails on darwin
Revert "[fuzzer] Script to detect unbalanced allocation in -trace_malloc output"
Needs previous one.
This reverts commit r317034, r317036.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@317061 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/fuzzer')
-rw-r--r-- | test/fuzzer/TraceMallocThreadedTest.cpp | 22 | ||||
-rw-r--r-- | test/fuzzer/trace-malloc-threaded.test | 36 | ||||
-rw-r--r-- | test/fuzzer/trace-malloc-unbalanced.test | 27 |
3 files changed, 0 insertions, 85 deletions
diff --git a/test/fuzzer/TraceMallocThreadedTest.cpp b/test/fuzzer/TraceMallocThreadedTest.cpp deleted file mode 100644 index 5603af344..000000000 --- a/test/fuzzer/TraceMallocThreadedTest.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. - -// Check that allocation tracing from different threads does not cause -// interleaving of stack traces. -#include <assert.h> -#include <cstddef> -#include <cstdint> -#include <cstring> -#include <thread> - -extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { - auto C = [&] { - volatile void *a = malloc(5639); - free((void *)a); - }; - std::thread T[] = {std::thread(C), std::thread(C), std::thread(C), - std::thread(C), std::thread(C), std::thread(C)}; - for (auto &X : T) - X.join(); - return 0; -} diff --git a/test/fuzzer/trace-malloc-threaded.test b/test/fuzzer/trace-malloc-threaded.test deleted file mode 100644 index 11f3f0491..000000000 --- a/test/fuzzer/trace-malloc-threaded.test +++ /dev/null @@ -1,36 +0,0 @@ -// FIXME: This test infinite loops on darwin because it crashes -// printing a stack trace repeatedly -UNSUPPORTED: darwin - -RUN: %cpp_compiler %S/TraceMallocThreadedTest.cpp -o %t-TraceMallocThreadedTest - -RUN: %t-TraceMallocThreadedTest -trace_malloc=2 -runs=1 2>&1 | FileCheck %s -CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}} -CHECK-NEXT: {{ +\#0 +}} -CHECK-NEXT: {{ +\#1 +}} -CHECK-NEXT: {{ +\#2 +}} - -CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}} -CHECK-NEXT: {{ +\#0 +}} -CHECK-NEXT: {{ +\#1 +}} -CHECK-NEXT: {{ +\#2 +}} - -CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}} -CHECK-NEXT: {{ +\#0 +}} -CHECK-NEXT: {{ +\#1 +}} -CHECK-NEXT: {{ +\#2 +}} - -CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}} -CHECK-NEXT: {{ +\#0 +}} -CHECK-NEXT: {{ +\#1 +}} -CHECK-NEXT: {{ +\#2 +}} - -CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}} -CHECK-NEXT: {{ +\#0 +}} -CHECK-NEXT: {{ +\#1 +}} -CHECK-NEXT: {{ +\#2 +}} - -CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}} -CHECK-NEXT: {{ +\#0 +}} -CHECK-NEXT: {{ +\#1 +}} -CHECK-NEXT: {{ +\#2 +}} diff --git a/test/fuzzer/trace-malloc-unbalanced.test b/test/fuzzer/trace-malloc-unbalanced.test deleted file mode 100644 index 53b83fb68..000000000 --- a/test/fuzzer/trace-malloc-unbalanced.test +++ /dev/null @@ -1,27 +0,0 @@ -// FIXME: This test infinite loops on darwin because it crashes -// printing a stack trace repeatedly -UNSUPPORTED: darwin - -// Verifies lib/fuzzer/scripts/unbalanced_allocs.py script - -RUN: %cpp_compiler %S/TraceMallocTest.cpp -o %t-TraceMallocTest - -RUN: %t-TraceMallocTest -seed=1 -trace_malloc=1 -runs=100 2>&1 | \ -RUN: %libfuzzer_src/scripts/unbalanced_allocs.py --skip=5 | FileCheck %s - -RUN: %t-TraceMallocTest -seed=1 -trace_malloc=2 -runs=100 2>&1 | \ -RUN: %libfuzzer_src/scripts/unbalanced_allocs.py --skip=5 | FileCheck %s --check-prefixes=CHECK,CHECK2 - -CHECK: MallocFreeTracer: START -CHECK: Unbalanced MALLOC[{{[0-9]+}}] [[PTR:0x[0-9a-f]+]] 4 -CHECK2-NEXT: {{ #0 0x[0-9a-f]+ in }} -CHECK2-NEXT: {{ #1 0x[0-9a-f]+ in }} -CHECK2-NEXT: {{ #2 0x[0-9a-f]+ in }} -CHECK: MallocFreeTracer: STOP - -CHECK: MallocFreeTracer: START -CHECK: Unbalanced FREE[{{[0-9]+}}] [[PTR]] -CHECK2-NEXT: {{ #0 0x[0-9a-f]+ in }} -CHECK2-NEXT: {{ #1 0x[0-9a-f]+ in }} -CHECK2-NEXT: {{ #2 0x[0-9a-f]+ in }} -CHECK: MallocFreeTracer: STOP |