From 125a3022572288892ee5ddf0cb036306f26561f7 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Wed, 11 Jun 2014 09:09:09 +0000 Subject: [PATCH] [asan] Fix coverage-android test to avoid name conflict. And re-enable it. llvm-svn: 210646 --- .../asan/TestCases/Android/{coverage.cc => coverage-android.cc} | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) rename compiler-rt/test/asan/TestCases/Android/{coverage.cc => coverage-android.cc} (81%) diff --git a/compiler-rt/test/asan/TestCases/Android/coverage.cc b/compiler-rt/test/asan/TestCases/Android/coverage-android.cc similarity index 81% rename from compiler-rt/test/asan/TestCases/Android/coverage.cc rename to compiler-rt/test/asan/TestCases/Android/coverage-android.cc index 980811e..d4ea90c 100644 --- a/compiler-rt/test/asan/TestCases/Android/coverage.cc +++ b/compiler-rt/test/asan/TestCases/Android/coverage-android.cc @@ -1,5 +1,5 @@ // Test for direct coverage writing with dlopen. -// RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSHARED %s -shared -o %T/libcoverage_direct_test_1.so -fPIC +// RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSHARED %s -shared -o %T/libcoverage_android_test_1.so -fPIC // RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSO_DIR=\"%device\" %s -o %t // RUN: adb shell rm -rf %device/coverage-direct @@ -12,10 +12,7 @@ // RUN: ls; pwd // RUN: cd %T/coverage-direct/direct // RUN: %sancov rawunpack *.sancov.raw -// RUN: %sancov print *.sancov - -// FIXME: FileCheck disabled due to flakiness in the test. Fix and re-enable. -// ... |& FileCheck %s +// RUN: %sancov print *.sancov |& FileCheck %s #include #include @@ -31,7 +28,7 @@ void bar() { printf("bar\n"); } int main(int argc, char **argv) { fprintf(stderr, "PID: %d\n", getpid()); void *handle1 = - dlopen(SO_DIR "/libcoverage_direct_test_1.so", RTLD_LAZY); + dlopen(SO_DIR "/libcoverage_android_test_1.so", RTLD_LAZY); assert(handle1); void (*bar1)() = (void (*)())dlsym(handle1, "bar"); assert(bar1); -- 2.7.4