[compiler-rt] r210646 - [asan] Fix coverage-android test to avoid name conflict.

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Jun 11 04:09:09 2014
New Revision: 210646

URL: http://llvm.org/viewvc/llvm-project?rev=210646&view=rev
Log:
[asan] Fix coverage-android test to avoid name conflict.

And re-enable it.

Added:
    compiler-rt/trunk/test/asan/TestCases/Android/coverage-android.cc
      - copied, changed from r210644, compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc
Removed:
    compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc

Copied: compiler-rt/trunk/test/asan/TestCases/Android/coverage-android.cc (from r210644, compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Android/coverage-android.cc?p2=compiler-rt/trunk/test/asan/TestCases/Android/coverage-android.cc&p1=compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc&r1=210644&r2=210646&rev=210646&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Android/coverage-android.cc Wed Jun 11 04:09:09 2014
@@ -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 <assert.h>
 #include <dlfcn.h>
@@ -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);

Removed: compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc?rev=210645&view=auto
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Android/coverage.cc (removed)
@@ -1,44 +0,0 @@
-// 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 -DSO_DIR=\"%device\" %s -o %t
-
-// RUN: adb shell rm -rf %device/coverage-direct
-// RUN: rm -rf %T/coverage-direct
-
-// RUN: adb shell mkdir -p %device/coverage-direct/direct
-// RUN: mkdir -p %T/coverage-direct/direct
-// RUN: ASAN_OPTIONS=coverage=1:coverage_direct=1:coverage_dir=%device/coverage-direct/direct:verbosity=1 %run %t
-// RUN: adb pull %device/coverage-direct/direct %T/coverage-direct/direct
-// 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
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#ifdef SHARED
-extern "C" {
-void bar() { printf("bar\n"); }
-}
-#else
-
-int main(int argc, char **argv) {
-  fprintf(stderr, "PID: %d\n", getpid());
-  void *handle1 =
-      dlopen(SO_DIR "/libcoverage_direct_test_1.so", RTLD_LAZY);
-  assert(handle1);
-  void (*bar1)() = (void (*)())dlsym(handle1, "bar");
-  assert(bar1);
-  bar1();
-
-  return 0;
-}
-#endif
-
-// CHECK: 2 PCs total