diff options
Diffstat (limited to 'libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign')
2 files changed, 9 insertions, 4 deletions
diff --git a/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp b/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp index 94a30e74218..2db9430a698 100644 --- a/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp +++ b/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp @@ -48,13 +48,16 @@ int main() { assert(G::n_alive == 0); assert(!G::op_run); - std::thread t0(G(), 5, 5.5); + { + G g; + std::thread t0(g, 5, 5.5); std::thread::id id = t0.get_id(); std::thread t1; t1 = std::move(t0); assert(t1.get_id() == id); assert(t0.get_id() == std::thread::id()); t1.join(); + } assert(G::n_alive == 0); assert(G::op_run); } diff --git a/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp b/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp index 8cb2cb17cd3..7198d226960 100644 --- a/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp +++ b/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/move2.pass.cpp @@ -13,6 +13,9 @@ // memory is not freed. This will cause ASAN to fail. // XFAIL: asan +// NOTE: TSAN will report this test as leaking a thread. +// XFAIL: tsan + // <thread> // class thread @@ -62,14 +65,13 @@ void f1() int main() { -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES std::set_terminate(f1); { - std::thread t0(G(), 5, 5.5); + G g; + std::thread t0(g, 5, 5.5); std::thread::id id = t0.get_id(); std::thread t1; t0 = std::move(t1); assert(false); } -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } |
