Split thread test into two parts. Mark one as XFAIL with ASAN.

The second part of the test checks that std::terminate is called when a running
thread is move assigned to. Calling std::terminate prevents some of the destructors
to be called and ASAN fires on this.



git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@222076 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2014-11-15 01:58:45 +00:00
parent 017e1aab88
commit 0364baca04
2 changed files with 75 additions and 22 deletions

View File

@ -16,8 +16,6 @@
// thread& operator=(thread&& t);
#include <thread>
#include <new>
#include <cstdlib>
#include <cassert>
class G
@ -31,13 +29,6 @@ public:
G(const G& g) : alive_(g.alive_) {++n_alive;}
~G() {alive_ = 0; --n_alive;}
void operator()()
{
assert(alive_ == 1);
assert(n_alive >= 1);
op_run = true;
}
void operator()(int i, double j)
{
assert(alive_ == 1);
@ -51,15 +42,9 @@ public:
int G::n_alive = 0;
bool G::op_run = false;
void f1()
{
std::exit(0);
}
int main()
{
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
std::set_terminate(f1);
{
assert(G::n_alive == 0);
assert(!G::op_run);
@ -73,12 +58,5 @@ int main()
assert(G::n_alive == 0);
assert(G::op_run);
}
{
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
}

View File

@ -0,0 +1,75 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// UNSUPPORTED: libcpp-has-no-threads
// NOTE: std::terminate is called so the destructors are not invoked and the
// memory is not freed. This will cause ASAN to fail.
// XFAIL: asan
// <thread>
// class thread
// thread& operator=(thread&& t);
#include <thread>
#include <exception>
#include <cstdlib>
#include <cassert>
class G
{
int alive_;
public:
static int n_alive;
static bool op_run;
G() : alive_(1) {++n_alive;}
G(const G& g) : alive_(g.alive_) {++n_alive;}
~G() {alive_ = 0; --n_alive;}
void operator()()
{
assert(alive_ == 1);
assert(n_alive >= 1);
op_run = true;
}
void operator()(int i, double j)
{
assert(alive_ == 1);
assert(n_alive >= 1);
assert(i == 5);
assert(j == 5.5);
op_run = true;
}
};
int G::n_alive = 0;
bool G::op_run = false;
void f1()
{
std::exit(0);
}
int main()
{
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
std::set_terminate(f1);
{
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
}