[compiler-rt] r228001 - [ASan] Run tests with both static and dynamic runtime on Windows by default.

[Timur Iskhodzhanov]

Maybe we should make check-asan depend on check-asan-dynamic on Windows?

On Tue Feb 03 2015 at 9:58:24 PM Alexey Samsonov <vonosmas at gmail.com> wrote:

> Author: samsonov
> Date: Tue Feb  3 12:40:34 2015
> New Revision: 228001
>
> URL: http://llvm.org/viewvc/llvm-project?rev=228001&view=rev
> Log:
> [ASan] Run tests with both static and dynamic runtime on Windows by
> default.
>
> Modified:
>     compiler-rt/trunk/cmake/config-ix.cmake
>     compiler-rt/trunk/test/asan/CMakeLists.txt
>
> Modified: compiler-rt/trunk/cmake/config-ix.cmake
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/
> cmake/config-ix.cmake?rev=228001&r1=228000&r2=228001&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/cmake/config-ix.cmake (original)
> +++ compiler-rt/trunk/cmake/config-ix.cmake Tue Feb  3 12:40:34 2015
> @@ -225,7 +225,7 @@ else()
>    set(COMPILER_RT_HAS_ASAN FALSE)
>  endif()
>
> -if (OS_NAME MATCHES "Linux|FreeBSD")
> +if (OS_NAME MATCHES "Linux|FreeBSD|Windows")
>    set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME TRUE)
>  else()
>    set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME FALSE)
>
> Modified: compiler-rt/trunk/test/asan/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/
> test/asan/CMakeLists.txt?rev=228001&r1=228000&r2=228001&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/test/asan/CMakeLists.txt (original)
> +++ compiler-rt/trunk/test/asan/CMakeLists.txt Tue Feb  3 12:40:34 2015
> @@ -93,13 +93,18 @@ add_lit_testsuite(check-asan "Running th
>  set_target_properties(check-asan PROPERTIES FOLDER "ASan tests")
>
>  if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME)
> -  # Add check-dynamic-asan target (not included in check-all)
> -  set(EXCLUDE_FROM_ALL TRUE)
> +  # Add check-dynamic-asan target. It is a part of check-all only on
> Windows,
> +  # where we want to always test both dynamic and static runtime.
> +  if(NOT OS_NAME MATCHES "Windows")
> +    set(EXCLUDE_FROM_ALL TRUE)
> +  endif()
>    add_lit_testsuite(check-asan-dynamic
>                      "Running the AddressSanitizer tests with dynamic
> runtime"
>                      ${ASAN_DYNAMIC_TESTSUITES}
>                      DEPENDS ${ASAN_DYNAMIC_TEST_DEPS})
>    set_target_properties(check-asan-dynamic
>                          PROPERTIES FOLDER "ASan dynamic tests")
> -  set(EXCLUDE_FROM_ALL FALSE)
> +  if(NOT OS_NAME MATCHES "Windows")
> +    set(EXCLUDE_FROM_ALL FALSE)
> +  endif()
>  endif()
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150204/e345d7b5/attachment.html>