<div dir="ltr">Oops, sorry lost track of this. I've slightly adjusted the fix in r261142 - I think that version should go to 3.8</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Feb 17, 2016 at 10:06 AM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Alexey: ping?<br>
<div class="HOEnZb"><div class="h5"><br>
On Sun, Feb 14, 2016 at 2:05 AM, Daniel Sanders<br>
<<a href="mailto:Daniel.Sanders@imgtec.com">Daniel.Sanders@imgtec.com</a>> wrote:<br>
> Hi,<br>
><br>
> Is it ok to merge the tsan part of this to the 3.8 release?<br>
> ________________________________________<br>
> From: llvm-commits [<a href="mailto:llvm-commits-bounces@lists.llvm.org">llvm-commits-bounces@lists.llvm.org</a>] on behalf of Daniel Sanders via llvm-commits [<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>]<br>
> Sent: 12 February 2016 10:35<br>
> To: <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> Subject: [compiler-rt] r260669 - [msan+tsan] Bring back the tests that disappeared after r260230 and r259512.<br>
><br>
> Author: dsanders<br>
> Date: Fri Feb 12 04:35:53 2016<br>
> New Revision: 260669<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=260669&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=260669&view=rev</a><br>
> Log:<br>
> [msan+tsan] Bring back the tests that disappeared after r260230 and r259512.<br>
><br>
> The lit test-suite containing the unit tests needs to be explicitly specified<br>
> as an argument to lit.py since it is no longer discovered when the other tests<br>
> are run (because they are one directory deeper).<br>
><br>
> dfsan, lsan, and sanitizer_common don't show the same problem.<br>
><br>
><br>
> Modified:<br>
>     compiler-rt/trunk/test/msan/CMakeLists.txt<br>
>     compiler-rt/trunk/test/tsan/CMakeLists.txt<br>
><br>
> Modified: compiler-rt/trunk/test/msan/CMakeLists.txt<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/CMakeLists.txt?rev=260669&r1=260668&r2=260669&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/CMakeLists.txt?rev=260669&r1=260668&r2=260669&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/test/msan/CMakeLists.txt (original)<br>
> +++ compiler-rt/trunk/test/msan/CMakeLists.txt Fri Feb 12 04:35:53 2016<br>
> @@ -41,7 +41,7 @@ if(COMPILER_RT_INCLUDE_TESTS AND COMPILE<br>
>  endif()<br>
><br>
>  add_lit_testsuite(check-msan "Running the MemorySanitizer tests"<br>
> -  ${MSAN_TESTSUITES}<br>
> +  ${MSAN_TESTSUITES} ${CMAKE_CURRENT_BINARY_DIR}/Unit<br>
>    DEPENDS ${MSAN_TEST_DEPS}<br>
>    )<br>
>  set_target_properties(check-msan PROPERTIES FOLDER "MSan tests")<br>
><br>
> Modified: compiler-rt/trunk/test/tsan/CMakeLists.txt<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/CMakeLists.txt?rev=260669&r1=260668&r2=260669&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/CMakeLists.txt?rev=260669&r1=260668&r2=260669&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/test/tsan/CMakeLists.txt (original)<br>
> +++ compiler-rt/trunk/test/tsan/CMakeLists.txt Fri Feb 12 04:35:53 2016<br>
> @@ -50,6 +50,6 @@ if(COMPILER_RT_INCLUDE_TESTS)<br>
>  endif()<br>
><br>
>  add_lit_testsuite(check-tsan "Running ThreadSanitizer tests"<br>
> -  ${TSAN_TESTSUITES}<br>
> +  ${TSAN_TESTSUITES} ${CMAKE_CURRENT_BINARY_DIR}/Unit<br>
>    DEPENDS ${TSAN_TEST_DEPS})<br>
>  set_target_properties(check-tsan PROPERTIES FOLDER "TSan tests")<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>