<div dir="ltr">Maybe we should make check-asan depend on check-asan-dynamic on Windows?<br></div><br><div class="gmail_quote">On Tue Feb 03 2015 at 9:58:24 PM Alexey Samsonov <<a href="mailto:vonosmas@gmail.com">vonosmas@gmail.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: samsonov<br>
Date: Tue Feb  3 12:40:34 2015<br>
New Revision: 228001<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=228001&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=228001&view=rev</a><br>
Log:<br>
[ASan] Run tests with both static and dynamic runtime on Windows by default.<br>
<br>
Modified:<br>
    compiler-rt/trunk/cmake/<u></u>config-ix.cmake<br>
    compiler-rt/trunk/test/asan/<u></u>CMakeLists.txt<br>
<br>
Modified: compiler-rt/trunk/cmake/<u></u>config-ix.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=228001&r1=228000&r2=228001&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/compiler-rt/trunk/<u></u>cmake/config-ix.cmake?rev=<u></u>228001&r1=228000&r2=228001&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- compiler-rt/trunk/cmake/<u></u>config-ix.cmake (original)<br>
+++ compiler-rt/trunk/cmake/<u></u>config-ix.cmake Tue Feb  3 12:40:34 2015<br>
@@ -225,7 +225,7 @@ else()<br>
   set(COMPILER_RT_HAS_ASAN FALSE)<br>
 endif()<br>
<br>
-if (OS_NAME MATCHES "Linux|FreeBSD")<br>
+if (OS_NAME MATCHES "Linux|FreeBSD|Windows")<br>
   set(COMPILER_RT_ASAN_HAS_<u></u>STATIC_RUNTIME TRUE)<br>
 else()<br>
   set(COMPILER_RT_ASAN_HAS_<u></u>STATIC_RUNTIME FALSE)<br>
<br>
Modified: compiler-rt/trunk/test/asan/<u></u>CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/CMakeLists.txt?rev=228001&r1=228000&r2=228001&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/compiler-rt/trunk/<u></u>test/asan/CMakeLists.txt?rev=<u></u>228001&r1=228000&r2=228001&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- compiler-rt/trunk/test/asan/<u></u>CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/test/asan/<u></u>CMakeLists.txt Tue Feb  3 12:40:34 2015<br>
@@ -93,13 +93,18 @@ add_lit_testsuite(check-asan "Running th<br>
 set_target_properties(check-<u></u>asan PROPERTIES FOLDER "ASan tests")<br>
<br>
 if(COMPILER_RT_ASAN_HAS_<u></u>STATIC_RUNTIME)<br>
-  # Add check-dynamic-asan target (not included in check-all)<br>
-  set(EXCLUDE_FROM_ALL TRUE)<br>
+  # Add check-dynamic-asan target. It is a part of check-all only on Windows,<br>
+  # where we want to always test both dynamic and static runtime.<br>
+  if(NOT OS_NAME MATCHES "Windows")<br>
+    set(EXCLUDE_FROM_ALL TRUE)<br>
+  endif()<br>
   add_lit_testsuite(check-asan-<u></u>dynamic<br>
                     "Running the AddressSanitizer tests with dynamic runtime"<br>
                     ${ASAN_DYNAMIC_TESTSUITES}<br>
                     DEPENDS ${ASAN_DYNAMIC_TEST_DEPS})<br>
   set_target_properties(check-<u></u>asan-dynamic<br>
                         PROPERTIES FOLDER "ASan dynamic tests")<br>
-  set(EXCLUDE_FROM_ALL FALSE)<br>
+  if(NOT OS_NAME MATCHES "Windows")<br>
+    set(EXCLUDE_FROM_ALL FALSE)<br>
+  endif()<br>
 endif()<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">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/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote></div>