diff options
| author | Marshall Clow <mclow@qualcomm.com> | 2013-03-26 15:28:33 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow@qualcomm.com> | 2013-03-26 15:28:33 +0000 |
| commit | a6d24cc19de69872394dab701f27a9f8eddbc4e4 (patch) | |
| tree | 7cf04e8755c9aa43ef8a002925692e5afeecb190 /libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign | |
| parent | 414ef565bb4ae453a535bcb9f06ba83f88938570 (diff) | |
| download | bcm5719-llvm-a6d24cc19de69872394dab701f27a9f8eddbc4e4.tar.gz bcm5719-llvm-a6d24cc19de69872394dab701f27a9f8eddbc4e4.zip | |
Fixed race conditions in thread tests; exposed by UBSan
llvm-svn: 178029
Diffstat (limited to 'libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign')
| -rw-r--r-- | libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp | 2 | ||||
| -rw-r--r-- | libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp b/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp index 246488e5a53..7373886f617 100644 --- a/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp +++ b/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp @@ -32,7 +32,7 @@ public: void operator()() { assert(alive_ == 1); - assert(n_alive == 1); + assert(n_alive >= 1); op_run = true; } diff --git a/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp b/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp index 7e35652bbd2..1a5f3208eed 100644 --- a/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp +++ b/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp @@ -32,14 +32,14 @@ public: void operator()() { assert(alive_ == 1); - assert(n_alive == 1); + assert(n_alive >= 1); op_run = true; } void operator()(int i, double j) { assert(alive_ == 1); - assert(n_alive == 1); + assert(n_alive >= 1); assert(i == 5); assert(j == 5.5); op_run = true; |
