vendor/libc++/libc++-trunk-r303197

3 files changed, 22 insertions, 146 deletions

diff --git a/test/std/thread/thread.condition/PR30202_notify_from_pthread_created_thread.pass.cpp b/test/std/thread/thread.condition/PR30202_notify_from_pthread_created_thread.pass.cpp
deleted file mode 100644
index de225fe78384e..0000000000000
--- a/test/std/thread/thread.condition/PR30202_notify_from_pthread_created_thread.pass.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     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
-// REQUIRES: libcpp-has-thread-api-pthread
-
-// notify_all_at_thread_exit(...) requires move semantics to transfer the
-// unique_lock.
-// UNSUPPORTED: c++98, c++03
-
-// <condition_variable>
-
-// void
-//   notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk);
-
-// Test that this function works with threads that were not created by
-// std::thread. See http://llvm.org/PR30202.
-
-
-#include <condition_variable>
-#include <mutex>
-#include <thread>
-#include <chrono>
-#include <cassert>
-#include <pthread.h>
-
-std::condition_variable cv;
-std::mutex mut;
-bool exited = false;
-
-typedef std::chrono::milliseconds ms;
-typedef std::chrono::high_resolution_clock Clock;
-
-void* func(void*)
-{
-    std::unique_lock<std::mutex> lk(mut);
-    std::notify_all_at_thread_exit(cv, std::move(lk));
-    std::this_thread::sleep_for(ms(300));
-    exited = true;
-    return nullptr;
-}
-
-int main()
-{
-    {
-    std::unique_lock<std::mutex> lk(mut);
-    pthread_t id;
-    int res = pthread_create(&id, 0, &func, nullptr);
-    assert(res == 0);
-    Clock::time_point t0 = Clock::now();
-    assert(exited == false);
-    cv.wait(lk);
-    Clock::time_point t1 = Clock::now();
-    assert(exited);
-    assert(t1-t0 > ms(250));
-    pthread_join(id, 0);
-    }
-    exited = false;
-    {
-    std::unique_lock<std::mutex> lk(mut);
-    std::thread t(&func, nullptr);
-    Clock::time_point t0 = Clock::now();
-    assert(exited == false);
-    cv.wait(lk);
-    Clock::time_point t1 = Clock::now();
-    assert(exited);
-    assert(t1-t0 > ms(250));
-    t.join();
-    }
-}
diff --git a/test/std/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp b/test/std/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
deleted file mode 100644
index 891b084dd32e4..0000000000000
--- a/test/std/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     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
-
-// This test uses the POSIX header <sys/time.h> which Windows doesn't provide
-// UNSUPPORTED: windows
-
-// This test depends on signal behaviour until r210210, so some system libs
-// don't pass.
-//
-// XFAIL: with_system_cxx_lib=macosx10.11
-// XFAIL: with_system_cxx_lib=macosx10.10
-// XFAIL: with_system_cxx_lib=macosx10.9
-// XFAIL: with_system_cxx_lib=macosx10.8
-// XFAIL: with_system_cxx_lib=macosx10.7
-
-// <thread>
-
-// template <class Rep, class Period>
-//   void sleep_for(const chrono::duration<Rep, Period>& rel_time);
-
-#include <thread>
-#include <cstdlib>
-#include <cassert>
-#include <cstring>
-#include <signal.h>
-#include <sys/time.h>
-
-void sig_action(int) {}
-
-#include <iostream>
-int main()
-{
-    int ec;
-    struct sigaction action;
-    action.sa_handler = &sig_action;
-    sigemptyset(&action.sa_mask);
-    action.sa_flags = 0;
-
-    ec = sigaction(SIGALRM, &action, nullptr);
-    assert(!ec);
-
-    struct itimerval it;
-    std::memset(&it, 0, sizeof(itimerval));
-    it.it_value.tv_sec = 0;
-    it.it_value.tv_usec = 250000;
-    // This will result in a SIGALRM getting fired resulting in the nanosleep
-    // inside sleep_for getting EINTR.
-    ec = setitimer(ITIMER_REAL, &it, nullptr);
-    assert(!ec);
-
-    typedef std::chrono::system_clock Clock;
-    typedef Clock::time_point time_point;
-    typedef Clock::duration duration;
-    std::chrono::milliseconds ms(500);
-    time_point t0 = Clock::now();
-    std::this_thread::sleep_for(ms);
-    time_point t1 = Clock::now();
-    std::chrono::nanoseconds ns = (t1 - t0) - ms;
-    std::chrono::nanoseconds err = 5 * ms / 100;
-    // The time slept is within 5% of 500ms
-    assert(std::abs(ns.count()) < err.count());
-}
diff --git a/test/std/thread/thread.threads/thread.thread.this/sleep_for_tested_elsewhere.pass.cpp b/test/std/thread/thread.threads/thread.thread.this/sleep_for_tested_elsewhere.pass.cpp
new file mode 100644
index 0000000000000..3406fff706103
--- /dev/null
+++ b/test/std/thread/thread.threads/thread.thread.this/sleep_for_tested_elsewhere.pass.cpp
@@ -0,0 +1,22 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+//                     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.
+//
+//===----------------------------------------------------------------------===//
+
+// <thread>
+
+// template <class Rep, class Period>
+//   void sleep_for(const chrono::duration<Rep, Period>& rel_time);
+
+// The std::this_thread::sleep_for test requires POSIX specific headers and
+// is therefore non-standard. For this reason the test lives under the 'libcxx'
+// subdirectory.
+
+int main()
+{
+}