From aa772feb8ec053b2c8cef2fe6af5676157334f36 Mon Sep 17 00:00:00 2001 From: Kuba Brecka Date: Tue, 27 Jan 2015 01:29:18 +0000 Subject: [PATCH] [ASan] Use rpath in tests that produce a shared library Modifying Darwin/interception-in-shared-lib-test.cc and suppressions-library.cc to use rpath instead of linking against the full path to the temporary file. NFC. llvm-svn: 227161 --- .../test/asan/TestCases/Darwin/interception-in-shared-lib-test.cc | 6 +++--- compiler-rt/test/asan/TestCases/suppressions-library.cc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler-rt/test/asan/TestCases/Darwin/interception-in-shared-lib-test.cc b/compiler-rt/test/asan/TestCases/Darwin/interception-in-shared-lib-test.cc index e472a9d..028683d 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/interception-in-shared-lib-test.cc +++ b/compiler-rt/test/asan/TestCases/Darwin/interception-in-shared-lib-test.cc @@ -3,11 +3,11 @@ // ../Linux/interception-in-shared-lib-test.cc. // RUN: %clangxx_asan -O0 %s -DSHARED_LIB \ -// RUN: -shared -o %T/libinterception-in-shared-lib-test.so \ -// RUN: -fPIC +// RUN: -shared -o %t-so.so \ +// RUN: -fPIC -install_name @rpath/interception-in-shared-lib-test.cc.tmp-so.so // TODO(glider): figure out how to set rpath in a more portable way and unite // this test with ../Linux/interception-in-shared-lib-test.cc. -// RUN: %clangxx_asan -O0 %s -o %t -Wl,-rpath,@executable-path -L%T -linterception-in-shared-lib-test && \ +// RUN: %clangxx_asan -O0 %s -o %t -Wl,-rpath,@executable_path %t-so.so && \ // RUN: not %run %t 2>&1 | FileCheck %s #include diff --git a/compiler-rt/test/asan/TestCases/suppressions-library.cc b/compiler-rt/test/asan/TestCases/suppressions-library.cc index 1a03114..28f19f5 100644 --- a/compiler-rt/test/asan/TestCases/suppressions-library.cc +++ b/compiler-rt/test/asan/TestCases/suppressions-library.cc @@ -1,10 +1,10 @@ -// RUN: %clangxx_asan -O0 -DSHARED_LIB %s -fPIC -shared -o %t-so.so -// RUN: %clangxx_asan -O0 %s %t-so.so -o %t +// RUN: %clangxx_asan -O0 -DSHARED_LIB %s -fPIC -shared -o %t-so.so -install_name @rpath/suppressions-library.cc.tmp-so.so +// RUN: %clangxx_asan -O0 %s %t-so.so -o %t -rpath @executable_path // Check that without suppressions, we catch the issue. // RUN: not %run %t 2>&1 | FileCheck --check-prefix=CHECK-CRASH %s -// RUN: echo "interceptor_via_lib:%t-so.so" > %t.supp +// RUN: echo "interceptor_via_lib:suppressions-library.cc.tmp-so.so" > %t.supp // RUN: ASAN_OPTIONS="suppressions='%t.supp'" %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s // XFAIL: android -- 2.7.4