Fix a few testsuite bugs involving trailing null (or lack thereof) in strstream.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@157832 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode.pass.cpp b/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode.pass.cpp
index 39b4f79..1ad0bfa 100644
--- a/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode.pass.cpp
+++ b/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode.pass.cpp
@@ -25,7 +25,7 @@
int i = 321;
double d = 5.5;
std::string s("cat");
- out << i << ' ' << d << ' ' << s;
+ out << i << ' ' << d << ' ' << s << std::ends;
assert(out.str() == std::string("321 5.5 cat"));
}
{
@@ -35,7 +35,7 @@
int i = 321;
double d = 5.5;
std::string s("cat");
- out << i << ' ' << d << ' ' << s;
+ out << i << ' ' << d << ' ' << s << std::ends;
assert(out.str() == std::string("123 4.5 dog321 5.5 cat"));
}
}
diff --git a/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default.pass.cpp b/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default.pass.cpp
index 2847396..78343f8 100644
--- a/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default.pass.cpp
+++ b/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default.pass.cpp
@@ -22,6 +22,6 @@
int i = 123;
double d = 4.5;
std::string s("dog");
- out << i << ' ' << d << ' ' << s;
+ out << i << ' ' << d << ' ' << s << std::ends;
assert(out.str() == std::string("123 4.5 dog"));
}
diff --git a/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str.pass.cpp b/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str.pass.cpp
index e0f8d37..9a5542a 100644
--- a/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str.pass.cpp
+++ b/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str.pass.cpp
@@ -20,7 +20,7 @@
{
{
std::ostrstream out;
- out << 123 << ' ' << 4.5 << ' ' << "dog";
+ out << 123 << ' ' << 4.5 << ' ' << "dog" << std::ends;
assert(out.str() == std::string("123 4.5 dog"));
}
}
diff --git a/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default.pass.cpp b/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default.pass.cpp
index 7133c32..374f430 100644
--- a/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default.pass.cpp
+++ b/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default.pass.cpp
@@ -22,7 +22,7 @@
int i = 123;
double d = 4.5;
std::string s("dog");
- inout << i << ' ' << d << ' ' << s;
+ inout << i << ' ' << d << ' ' << s << std::ends;
assert(inout.str() == std::string("123 4.5 dog"));
i = 0;
d = 0;
@@ -30,5 +30,5 @@
inout >> i >> d >> s;
assert(i == 123);
assert(d == 4.5);
- assert(s == "dog");
+ assert(strcmp(s.c_str(), "dog") == 0);
}
diff --git a/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str.pass.cpp b/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str.pass.cpp
index db90e96..4ac1c44 100644
--- a/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str.pass.cpp
+++ b/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str.pass.cpp
@@ -20,7 +20,7 @@
{
{
std::strstream out;
- out << 123 << ' ' << 4.5 << ' ' << "dog";
+ out << 123 << ' ' << 4.5 << ' ' << "dog" << std::ends;
assert(out.str() == std::string("123 4.5 dog"));
}
}