<div dir="ltr">Thanks!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, May 14, 2014 at 7:41 AM, Timur Iskhodzhanov <span dir="ltr"><<a href="mailto:timurrrr@google.com" target="_blank">timurrrr@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: timurrrr<br>
Date: Wed May 14 09:41:38 2014<br>
New Revision: 208780<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=208780&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=208780&view=rev</a><br>
Log:<br>
[ASan tests] Get rid of SharedLibs/<br>
<br>
Removed:<br>
compiler-rt/trunk/test/asan/TestCases/SharedLibs/<br>
Modified:<br>
compiler-rt/trunk/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc<br>
compiler-rt/trunk/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc<br>
compiler-rt/trunk/test/asan/TestCases/Posix/init-order-dlopen.cc<br>
compiler-rt/trunk/test/asan/TestCases/Posix/shared-lib-test.cc<br>
compiler-rt/trunk/test/asan/TestCases/Posix/start-deactivated.cc<br>
compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc<br>
compiler-rt/trunk/test/asan/TestCases/dlclose-test.cc<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc?rev=208780&r1=208779&r2=208780&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc?rev=208780&r1=208779&r2=208780&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc Wed May 14 09:41:38 2014<br>
@@ -3,12 +3,14 @@<br>
// <a href="https://code.google.com/p/address-sanitizer/issues/detail?id=159" target="_blank">https://code.google.com/p/address-sanitizer/issues/detail?id=159</a><br>
<br>
// RUN: %clangxx_asan %s -o %t<br>
-// RUN: %clangxx %p/../SharedLibs/darwin-dummy-shared-lib-so.cc \<br>
+// RUN: %clangxx -DSHARED_LIB %s \<br>
// RUN: -dynamiclib -o darwin-dummy-shared-lib-so.dylib<br>
<br>
// FIXME: the following command line may hang in the case of a regression.<br>
// RUN: DYLD_INSERT_LIBRARIES=darwin-dummy-shared-lib-so.dylib \<br>
// RUN: %run %t 2>&1 | FileCheck %s || exit 1<br>
+<br>
+#if !defined(SHARED_LIB)<br>
#include <stdio.h><br>
#include <stdlib.h><br>
<br>
@@ -18,3 +20,6 @@ int main() {<br>
// CHECK: {{DYLD_INSERT_LIBRARIES=.*darwin-dummy-shared-lib-so.dylib.*}}<br>
return 0;<br>
}<br>
+#else // SHARED_LIB<br>
+void foo() {}<br>
+#endif // SHARED_LIB<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc?rev=208780&r1=208779&r2=208780&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc?rev=208780&r1=208779&r2=208780&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc Wed May 14 09:41:38 2014<br>
@@ -3,7 +3,7 @@<br>
<br>
// RUN: %clangxx_asan %s -o %t<br>
// RUN: %clangxx %p/../Helpers/echo-env.cc -o %T/echo-env<br>
-// RUN: %clangxx %p/../SharedLibs/darwin-dummy-shared-lib-so.cc \<br>
+// RUN: %clangxx -DSHARED_LIB %s \<br>
// RUN: -dynamiclib -o %t-darwin-dummy-shared-lib-so.dylib<br>
<br>
// Make sure DYLD_INSERT_LIBRARIES doesn't contain the runtime library before<br>
@@ -12,9 +12,14 @@<br>
// RUN: %run %t %T/echo-env >/dev/null 2>&1<br>
// RUN: DYLD_INSERT_LIBRARIES=%t-darwin-dummy-shared-lib-so.dylib \<br>
// RUN: %run %t %T/echo-env 2>&1 | FileCheck %s || exit 1<br>
+<br>
+#if !defined(SHARED_LIB)<br>
#include <unistd.h><br>
int main(int argc, char *argv[]) {<br>
execl(argv[1], argv[1], "DYLD_INSERT_LIBRARIES", NULL);<br>
// CHECK: {{DYLD_INSERT_LIBRARIES = .*darwin-dummy-shared-lib-so.dylib.*}}<br>
return 0;<br>
}<br>
+#else // SHARED_LIB<br>
+void foo() {}<br>
+#endif // SHARED_LIB<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/Posix/init-order-dlopen.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/init-order-dlopen.cc?rev=208780&r1=208779&r2=208780&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/init-order-dlopen.cc?rev=208780&r1=208779&r2=208780&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/Posix/init-order-dlopen.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/Posix/init-order-dlopen.cc Wed May 14 09:41:38 2014<br>
@@ -3,9 +3,9 @@<br>
<br>
// Assume we're on Darwin and try to pass -U to the linker. If this flag is<br>
// unsupported, don't use it.<br>
-// RUN: %clangxx_asan -O0 %p/../SharedLibs/init-order-dlopen-so.cc \<br>
+// RUN: %clangxx_asan -O0 -DSHARED_LIB %s \<br>
// RUN: -fPIC -shared -o %t-so.so -Wl,-U,_inc_global || \<br>
-// RUN: %clangxx_asan -O0 %p/../SharedLibs/init-order-dlopen-so.cc \<br>
+// RUN: %clangxx_asan -O0 -DSHARED_LIB %s \<br>
// RUN: -fPIC -shared -o %t-so.so<br>
// If the linker doesn't support --export-dynamic (which is ELF-specific),<br>
// try to link without that option.<br>
@@ -13,6 +13,7 @@<br>
// RUN: %clangxx_asan -O0 %s -lpthread -ldl -o %t -Wl,--export-dynamic || \<br>
// RUN: %clangxx_asan -O0 %s -lpthread -ldl -o %t<br>
// RUN: ASAN_OPTIONS=strict_init_order=true %run %t 2>&1 | FileCheck %s<br>
+#if !defined(SHARED_LIB)<br>
#include <dlfcn.h><br>
#include <pthread.h><br>
#include <stdio.h><br>
@@ -55,3 +56,17 @@ int main(int argc, char *argv[]) {<br>
// CHECK: PASSED<br>
return 0;<br>
}<br>
+#else // SHARED_LIB<br>
+#include <stdio.h><br>
+#include <unistd.h><br>
+<br>
+extern "C" void inc_global();<br>
+<br>
+int slow_init() {<br>
+ sleep(1);<br>
+ inc_global();<br>
+ return 42;<br>
+}<br>
+<br>
+int slowly_init_glob = slow_init();<br>
+#endif // SHARED_LIB<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/Posix/shared-lib-test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/shared-lib-test.cc?rev=208780&r1=208779&r2=208780&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/shared-lib-test.cc?rev=208780&r1=208779&r2=208780&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/Posix/shared-lib-test.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/Posix/shared-lib-test.cc Wed May 14 09:41:38 2014<br>
@@ -1,12 +1,13 @@<br>
-// RUN: %clangxx_asan -O0 %p/../SharedLibs/shared-lib-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O0 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O0 %s -ldl -o %t && not %run %t 2>&1 | FileCheck %s<br>
-// RUN: %clangxx_asan -O1 %p/../SharedLibs/shared-lib-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O1 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O1 %s -ldl -o %t && not %run %t 2>&1 | FileCheck %s<br>
-// RUN: %clangxx_asan -O2 %p/../SharedLibs/shared-lib-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O2 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O2 %s -ldl -o %t && not %run %t 2>&1 | FileCheck %s<br>
-// RUN: %clangxx_asan -O3 %p/../SharedLibs/shared-lib-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O3 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O3 %s -ldl -o %t && not %run %t 2>&1 | FileCheck %s<br>
<br>
+#if !defined(SHARED_LIB)<br>
#include <dlfcn.h><br>
#include <stdio.h><br>
#include <string.h><br>
@@ -36,3 +37,20 @@ int main(int argc, char *argv[]) {<br>
// CHECK: {{ #1 0x.* in main .*shared-lib-test.cc:}}[[@LINE-4]]<br>
return 0;<br>
}<br>
+#else // SHARED_LIBS<br>
+#include <stdio.h><br>
+#include <string.h><br>
+<br>
+int pad[10];<br>
+int GLOB[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};<br>
+<br>
+extern "C"<br>
+void inc(int index) {<br>
+ GLOB[index]++;<br>
+}<br>
+<br>
+extern "C"<br>
+void inc2(int *a, int index) {<br>
+ a[index]++;<br>
+}<br>
+#endif // SHARED_LIBS<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/Posix/start-deactivated.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/start-deactivated.cc?rev=208780&r1=208779&r2=208780&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/start-deactivated.cc?rev=208780&r1=208779&r2=208780&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/Posix/start-deactivated.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/Posix/start-deactivated.cc Wed May 14 09:41:38 2014<br>
@@ -2,11 +2,12 @@<br>
// Main executable is uninstrumented, but linked to ASan runtime. The shared<br>
// library is instrumented. Memory errors before dlopen are not detected.<br>
<br>
-// RUN: %clangxx_asan -O0 %p/../SharedLibs/start-deactivated-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O0 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx -O0 %s -c -o %t.o<br>
// RUN: %clangxx_asan -O0 %t.o -ldl -o %t<br>
// RUN: ASAN_OPTIONS=start_deactivated=1 not %run %t 2>&1 | FileCheck %s<br>
<br>
+#if !defined(SHARED_LIB)<br>
#include <dlfcn.h><br>
#include <stdio.h><br>
#include <stdlib.h><br>
@@ -55,3 +56,12 @@ int main(int argc, char *argv[]) {<br>
<br>
return 0;<br>
}<br>
+#else // SHARED_LIB<br>
+#include <stdio.h><br>
+#include <stdlib.h><br>
+<br>
+extern "C" void do_another_bad_thing() {<br>
+ char *volatile p = (char *)malloc(100);<br>
+ printf("%hhx\n", p[105]);<br>
+}<br>
+#endif // SHARED_LIB<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc?rev=208780&r1=208779&r2=208780&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc?rev=208780&r1=208779&r2=208780&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/asan-symbolize-sanity-test.cc Wed May 14 09:41:38 2014<br>
@@ -1,9 +1,11 @@<br>
// Check that asan_symbolize.py script works (for binaries, ASan RTL and<br>
// shared object files.<br>
<br>
-// RUN: %clangxx_asan -O0 %p/SharedLibs/shared-lib-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O0 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O0 %s -ldl -o %t<br>
// RUN: ASAN_OPTIONS=symbolize=0 not %run %t 2>&1 | %asan_symbolize | FileCheck %s<br>
+<br>
+#if !defined(SHARED_LIB)<br>
#include <dlfcn.h><br>
#include <stdio.h><br>
#include <stdlib.h><br>
@@ -30,10 +32,27 @@ int main(int argc, char *argv[]) {<br>
inc2(array, -1); // BOOM<br>
// CHECK: ERROR: AddressSanitizer: heap-buffer-overflow<br>
// CHECK: READ of size 4 at 0x{{.*}}<br>
- // CHECK: #0 {{.*}} in inc2 {{.*}}shared-lib-test-so.cc:26<br>
+ // CHECK: #0 {{.*}} in inc2 {{.*}}asan-symbolize-sanity-test.cc:56<br>
// CHECK: #1 {{.*}} in main {{.*}}asan-symbolize-sanity-test.cc:[[@LINE-4]]<br>
// CHECK: allocated by thread T{{.*}} here:<br>
// CHECK: #{{.*}} in {{(wrap_|__interceptor_)?}}malloc<br>
// CHECK: #{{.*}} in main {{.*}}asan-symbolize-sanity-test.cc:[[@LINE-9]]<br>
return 0;<br>
}<br>
+#else // SHARED_LIBS<br>
+#include <stdio.h><br>
+#include <string.h><br>
+<br>
+int pad[10];<br>
+int GLOB[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};<br>
+<br>
+extern "C"<br>
+void inc(int index) {<br>
+ GLOB[index]++;<br>
+}<br>
+<br>
+extern "C"<br>
+void inc2(int *a, int index) {<br>
+ a[index]++;<br>
+}<br>
+#endif // SHARED_LIBS<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/dlclose-test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/dlclose-test.cc?rev=208780&r1=208779&r2=208780&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/dlclose-test.cc?rev=208780&r1=208779&r2=208780&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/dlclose-test.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/dlclose-test.cc Wed May 14 09:41:38 2014<br>
@@ -14,15 +14,16 @@<br>
// It works on i368/x86_64 Linux, but not necessary anywhere else.<br>
// REQUIRES: x86_64-supported-target,i386-supported-target<br>
<br>
-// RUN: %clangxx_asan -O0 %p/SharedLibs/dlclose-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O0 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O0 %s -ldl -o %t && %run %t 2>&1 | FileCheck %s<br>
-// RUN: %clangxx_asan -O1 %p/SharedLibs/dlclose-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O1 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O1 %s -ldl -o %t && %run %t 2>&1 | FileCheck %s<br>
-// RUN: %clangxx_asan -O2 %p/SharedLibs/dlclose-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O2 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O2 %s -ldl -o %t && %run %t 2>&1 | FileCheck %s<br>
-// RUN: %clangxx_asan -O3 %p/SharedLibs/dlclose-test-so.cc -fPIC -shared -o %t-so.so<br>
+// RUN: %clangxx_asan -O3 -DSHARED_LIB %s -fPIC -shared -o %t-so.so<br>
// RUN: %clangxx_asan -O3 %s -ldl -o %t && %run %t 2>&1 | FileCheck %s<br>
<br>
+#if !defined(SHARED_LIB)<br>
#include <assert.h><br>
#include <dlfcn.h><br>
#include <stdio.h><br>
@@ -75,3 +76,24 @@ int main(int argc, char *argv[]) {<br>
// CHECK: PASS<br>
return 0;<br>
}<br>
+#else // SHARED_LIB<br>
+#include <stdio.h><br>
+<br>
+static int pad1;<br>
+static int static_var;<br>
+static int pad2;<br>
+<br>
+extern "C"<br>
+int *get_address_of_static_var() {<br>
+ return &static_var;<br>
+}<br>
+<br>
+__attribute__((constructor))<br>
+void at_dlopen() {<br>
+ printf("%s: I am being dlopened\n", __FILE__);<br>
+}<br>
+__attribute__((destructor))<br>
+void at_dlclose() {<br>
+ printf("%s: I am being dlclosed\n", __FILE__);<br>
+}<br>
+#endif // SHARED_LIB<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr"><div>Alexey Samsonov, Mountain View, CA</div></div>
</div>