summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std')
-rw-r--r--libcxx/test/std/atomics/libcpp-has-no-threads.fail.cpp23
-rw-r--r--libcxx/test/std/atomics/libcpp-has-no-threads.pass.cpp18
-rw-r--r--libcxx/test/std/utilities/date.time/tested_elsewhere.pass.cpp2
3 files changed, 2 insertions, 41 deletions
diff --git a/libcxx/test/std/atomics/libcpp-has-no-threads.fail.cpp b/libcxx/test/std/atomics/libcpp-has-no-threads.fail.cpp
deleted file mode 100644
index fe95e6a5983..00000000000
--- a/libcxx/test/std/atomics/libcpp-has-no-threads.fail.cpp
+++ /dev/null
@@ -1,23 +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.
-//
-//===----------------------------------------------------------------------===//
-
-// <atomic>
-
-// Test that including <atomic> fails to compile when _LIBCPP_HAS_NO_THREADS
-// is defined.
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-#define _LIBCPP_HAS_NO_THREADS
-#endif
-
-#include <atomic>
-
-int main()
-{
-}
diff --git a/libcxx/test/std/atomics/libcpp-has-no-threads.pass.cpp b/libcxx/test/std/atomics/libcpp-has-no-threads.pass.cpp
deleted file mode 100644
index 9c0cccbda38..00000000000
--- a/libcxx/test/std/atomics/libcpp-has-no-threads.pass.cpp
+++ /dev/null
@@ -1,18 +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.
-//
-//===----------------------------------------------------------------------===//
-// XFAIL: libcpp-has-no-threads
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error This should be XFAIL'd for the purpose of detecting that the LIT feature\
- 'libcpp-has-no-threads' is available iff _LIBCPP_HAS_NO_THREADS is defined
-#endif
-
-int main()
-{
-}
diff --git a/libcxx/test/std/utilities/date.time/tested_elsewhere.pass.cpp b/libcxx/test/std/utilities/date.time/tested_elsewhere.pass.cpp
index 419f415dee1..d0a838e0c27 100644
--- a/libcxx/test/std/utilities/date.time/tested_elsewhere.pass.cpp
+++ b/libcxx/test/std/utilities/date.time/tested_elsewhere.pass.cpp
@@ -30,9 +30,11 @@ int main()
static_assert((std::is_same<decltype(std::difftime(t,t)), double>::value), "");
static_assert((std::is_same<decltype(std::mktime(&tm)), std::time_t>::value), "");
static_assert((std::is_same<decltype(std::time(&t)), std::time_t>::value), "");
+#ifndef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
static_assert((std::is_same<decltype(std::asctime(&tm)), char*>::value), "");
static_assert((std::is_same<decltype(std::ctime(&t)), char*>::value), "");
static_assert((std::is_same<decltype(std::gmtime(&t)), std::tm*>::value), "");
static_assert((std::is_same<decltype(std::localtime(&t)), std::tm*>::value), "");
+#endif
static_assert((std::is_same<decltype(std::strftime(str,s,"",&tm)), std::size_t>::value), "");
}
OpenPOWER on IntegriCloud