<br><br><div class="gmail_quote">On Thu, Jun 28, 2012 at 5:12 PM, Alexey Samsonov <span dir="ltr"><<a href="mailto:samsonov@google.com" target="_blank">samsonov@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: samsonov<br>
Date: Thu Jun 28 08:12:07 2012<br>
New Revision: 159347<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=159347&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=159347&view=rev</a><br>
Log:<br>
[ASan] silence various warnings in cmake build of asan unit tests<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/tests/CMakeLists.txt<br>
    compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc<br>
    compiler-rt/trunk/lib/interception/CMakeLists.txt<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=159347&r1=159346&r2=159347&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=159347&r1=159346&r2=159347&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Thu Jun 28 08:12:07 2012<br>
@@ -14,8 +14,9 @@<br>
 include_directories(..)<br>
 include_directories(../..)<br>
<br>
-set(ASAN_UNITTEST_COMMON_CFLAGS<br>
+set(ASAN_UNITTEST_COMMON_CFLAGS<br>
   -Wall<br>
+  -Wno-format<br>
   -fvisibility=hidden<br>
 )<br>
<br>
@@ -101,7 +102,7 @@<br>
<br>
   add_asan_compile_cxx_command(asan_globals_test.cc)<br>
   add_asan_compile_cxx_command(asan_test.cc)<br>
-  set(ASAN_INSTRUMENTED_TESTS<br>
+  set(ASAN_INSTRUMENTED_TESTS<br>
     asan_globals_test.cc.asan.o<br>
     asan_test.cc.asan.o<br>
   )<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc?rev=159347&r1=159346&r2=159347&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc?rev=159347&r1=159346&r2=159347&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc Thu Jun 28 08:12:07 2012<br>
@@ -329,7 +329,7 @@<br>
 }<br>
<br>
 TEST(AddressSanitizerInterface, GetEstimatedAllocatedSize) {<br>
-  EXPECT_EQ(1, __asan_get_estimated_allocated_size(0));<br>
+  EXPECT_EQ(1U, __asan_get_estimated_allocated_size(0));<br>
   const size_t sizes[] = { 1, 30, 1<<30 };<br>
   for (size_t i = 0; i < 3; i++) {<br>
     EXPECT_EQ(sizes[i], __asan_get_estimated_allocated_size(sizes[i]));<br>
@@ -362,7 +362,7 @@<br>
<br>
   // NULL is not owned, but is a valid argument for __asan_get_allocated_size().<br>
   EXPECT_EQ(false, __asan_get_ownership(NULL));<br>
-  EXPECT_EQ(0, __asan_get_allocated_size(NULL));<br>
+  EXPECT_EQ(0U, __asan_get_allocated_size(NULL));<br>
<br>
   // When memory is freed, it's not owned, and call to GetAllocatedSize<br>
   // is forbidden.<br>
@@ -687,3 +687,9 @@<br>
   for (size_t i = 0, n = pointers.size(); i < n; i++)<br>
     free(pointers[i]);<br>
 }<br>
+<br>
+int main(int argc, char **argv) {<br>
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";<br>
+  testing::InitGoogleTest(&argc, argv);<br>
+  return RUN_ALL_TESTS();<br>
+}<br>
<br></blockquote><div><br></div><div>Does this still work with our old Makefiles? </div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Modified: compiler-rt/trunk/lib/interception/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/CMakeLists.txt?rev=159347&r1=159346&r2=159347&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/CMakeLists.txt?rev=159347&r1=159346&r2=159347&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/interception/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/interception/CMakeLists.txt Thu Jun 28 08:12:07 2012<br>
@@ -14,6 +14,9 @@<br>
 endif ()<br>
<br>
 set(INTERCEPTION_CFLAGS "-fPIC -fno-exceptions -funwind-tables -fvisibility=hidden")<br>
+if (SUPPORTS_NO_VARIADIC_MACROS_FLAG)<br>
+  set(INTERCEPTION_CFLAGS "${INTERCEPTION_CFLAGS} -Wno-variadic-macros")<br>
+endif ()<br>
<br>
 set(INTERCEPTION_COMMON_DEFINITIONS<br>
        INTERCEPTION_HAS_EXCEPTIONS=1)<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>