diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-08-02 18:12:06 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-08-02 18:12:06 +0000 |
| commit | a30af5f7cddc1c5409359f854da621282a0fa985 (patch) | |
| tree | bb5a8013a634d08691a3f81d0b11c48833093e53 /libcxx/test/input.output | |
| parent | 9080491dbd8e010c63d70495395fc8c6ad2e643f (diff) | |
| download | bcm5719-llvm-a30af5f7cddc1c5409359f854da621282a0fa985.tar.gz bcm5719-llvm-a30af5f7cddc1c5409359f854da621282a0fa985.zip | |
Andrew Morrow: This patch fixes
test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp
to accept '(nil)' as a valid representation for NULL so that the test
passes on Linux. The same thing is already done in some other tests,
like in /test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp.
llvm-svn: 161188
Diffstat (limited to 'libcxx/test/input.output')
| -rw-r--r-- | libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp index 13c68eae774..fe420a5a1c9 100644 --- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp +++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp @@ -63,7 +63,7 @@ int main() std::ostream os(&sb); const void* n = 0; os << n; - assert(sb.str() == "0x0"); + assert(sb.str() == "0x0" || sb.str() == "(nil)"); assert(os.good()); } { |
