<div style="font-family: arial, helvetica, sans-serif; font-size: 10pt"><br><br><div class="gmail_quote">On Fri, Nov 30, 2012 at 2:41 AM, Kostya Serebryany <span dir="ltr"><<a href="mailto:kcc@google.com" target="_blank">kcc@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: kcc<br>
Date: Fri Nov 30 04:41:42 2012<br>
New Revision: <a href="tel:168992" value="+49168992">168992</a><br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=168992&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=168992&view=rev</a><br>
Log:<br>
[asan] make asan_test.cc more gcc-friendly<br>
<br>
Modified:<br>
compiler-rt/trunk/lib/asan/tests/asan_test.cc<br>
compiler-rt/trunk/lib/asan/tests/asan_test_config.h<br>
compiler-rt/trunk/lib/asan/tests/asan_test_utils.h<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/asan_test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=168992&r1=168991&r2=168992&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=168992&r1=168991&r2=168992&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/asan_test.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/asan_test.cc Fri Nov 30 04:41:42 2012<br>
@@ -129,6 +129,8 @@<br>
TEST(AddressSanitizer, HasFeatureAddressSanitizerTest) {<br>
#if defined(__has_feature) && __has_feature(address_sanitizer)<br>
bool asan = 1;<br>
+#elif defined(__SANITIZE_ADDRESS__)<br>
+ bool asan = 1;<br>
#else<br>
bool asan = 0;<br>
#endif<br>
@@ -974,6 +976,7 @@<br>
size_t length = Ident(10);<br>
char *heap_string = Ident((char*)malloc(length + 1));<br>
char stack_string[10 + 1];<br>
+ break_optimization(&stack_string);<br>
for (size_t i = 0; i < length; i++) {<br>
heap_string[i] = 'a';<br>
stack_string[i] = 'b';<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/asan_test_config.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test_config.h?rev=168992&r1=168991&r2=168992&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test_config.h?rev=168992&r1=168991&r2=168992&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/asan_test_config.h (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/asan_test_config.h Fri Nov 30 04:41:42 2012<br>
@@ -21,7 +21,11 @@<br>
#include <string><br>
#include <map><br>
<br>
-#include "gtest/gtest.h"<br>
+#if ASAN_USE_DEJAGNU_GTEST<br>
+# include "dejagnu-gtest.h"<br>
+#else<br>
+# include "gtest/gtest.h"<br>
+#endif<br></blockquote><div><br></div><div>Just in case, you may also use -DASAN_EXTERNAL_TEST_CONFIG</div><div>and "-include asan_gcc_config_test_config.h"</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
using std::string;<br>
using std::vector;<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/asan_test_utils.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test_utils.h?rev=168992&r1=168991&r2=168992&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test_utils.h?rev=168992&r1=168991&r2=168992&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/asan_test_utils.h (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/asan_test_utils.h Fri Nov 30 04:41:42 2012<br>
@@ -40,7 +40,7 @@<br>
#define __has_feature(x) 0<br>
#endif<br>
<br>
-#if __has_feature(address_sanitizer)<br>
+#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)<br>
# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \<br>
__attribute__((no_address_safety_analysis))<br>
#else<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>Alexey Samsonov, MSK</div><br>
</div>