summaryrefslogtreecommitdiffstats
path: root/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2014-08-12 00:48:56 +0000
committerEric Fiselier <eric@efcs.ca>2014-08-12 00:48:56 +0000
commit90e0867742ae00e66a337234ca2ec087cdb6958f (patch)
tree1972b68b341d7d6bb5cbc3fca224bae6292aec20 /libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp
parent3d1a94c6a63692541896a42388a4c08efbd59959 (diff)
downloadbcm5719-llvm-90e0867742ae00e66a337234ca2ec087cdb6958f.tar.gz
bcm5719-llvm-90e0867742ae00e66a337234ca2ec087cdb6958f.zip
Change two tests to be less dependant on locales.
This patch removes the use of the "%c" specifier for getting/setting times. The semantics of this specifier differ between linux and Mac. I don't believe the use of this specifier was important to the test. The following tests now pass on linux. test/input.output/iostream.format/ext.manip/get_time.pass.cpp test/input.output/iostream.format/ext.manip/put_time.pass.cpp llvm-svn: 215417
Diffstat (limited to 'libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp')
-rw-r--r--libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp
index 686655245d5..17ff642dc46 100644
--- a/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp
@@ -43,7 +43,7 @@ int main()
std::istream is(&sb);
is.imbue(std::locale(LOCALE_en_US_UTF_8));
std::tm t = {0};
- is >> std::get_time(&t, "%c");
+ is >> std::get_time(&t, "%a %b %d %H:%M:%S %Y");
assert(t.tm_sec == 59);
assert(t.tm_min == 55);
assert(t.tm_hour == 23);
@@ -59,7 +59,7 @@ int main()
std::wistream is(&sb);
is.imbue(std::locale(LOCALE_en_US_UTF_8));
std::tm t = {0};
- is >> std::get_time(&t, L"%c");
+ is >> std::get_time(&t, L"%a %b %d %H:%M:%S %Y");
assert(t.tm_sec == 59);
assert(t.tm_min == 55);
assert(t.tm_hour == 23);
OpenPOWER on IntegriCloud