summaryrefslogtreecommitdiffstats
path: root/libcxx/test
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-02-19 14:51:01 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-02-19 14:51:01 +0000
commit08487f51b791e7db39ebf9b4bb1191102eef3d00 (patch)
treedb464121366c2ab2802e8f87757281b8ac652830 /libcxx/test
parent8eb351d72ed91035311a0aa05c3676841675a895 (diff)
downloadbcm5719-llvm-08487f51b791e7db39ebf9b4bb1191102eef3d00.tar.gz
bcm5719-llvm-08487f51b791e7db39ebf9b4bb1191102eef3d00.zip
Relax pointer output test to accept glibc's output. Patch supplied by Jeffrey Yasskin.
llvm-svn: 150927
Diffstat (limited to 'libcxx/test')
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
index c3769d89685..3303db96f2d 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
@@ -38,6 +38,6 @@ int main()
char str[50];
output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base());
- assert(ex == "0x0");
+ assert(ex == "0x0" || ex == "(nil)");
}
}
OpenPOWER on IntegriCloud