Misc drive-by cleanups. NFC

http://reviews.llvm.org/D12294

llvm-svn: 245876

3 files changed, 3 insertions, 1 deletions

diff --git a/libcxx/test/std/atomics/libcpp-has-no-threads.fail.cpp b/libcxx/test/libcxx/atomics/libcpp-has-no-threads.fail.cpp
index fe95e6a5983..fe95e6a5983 100644
--- a/libcxx/test/std/atomics/libcpp-has-no-threads.fail.cpp
+++ b/libcxx/test/libcxx/atomics/libcpp-has-no-threads.fail.cpp
diff --git a/libcxx/test/std/atomics/libcpp-has-no-threads.pass.cpp b/libcxx/test/libcxx/atomics/libcpp-has-no-threads.pass.cpp
index 9c0cccbda38..e587e6b4317 100644
--- a/libcxx/test/std/atomics/libcpp-has-no-threads.pass.cpp
+++ b/libcxx/test/libcxx/atomics/libcpp-has-no-threads.pass.cpp
@@ -10,7 +10,7 @@
 
 #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
+   '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), "");
 }