summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/strings/basic.string/string.modifiers/string_assign
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2016-01-20 03:19:15 +0000
committerMarshall Clow <mclow.lists@gmail.com>2016-01-20 03:19:15 +0000
commit9d10d27c6746199c736427556e27f94a5d055038 (patch)
tree9a5c48fde0ed619b335e9c32ee4423174e809020 /libcxx/test/std/strings/basic.string/string.modifiers/string_assign
parentefa5f6c1700b9b4298a5f5501e4080405f2df4c1 (diff)
downloadbcm5719-llvm-9d10d27c6746199c736427556e27f94a5d055038.tar.gz
bcm5719-llvm-9d10d27c6746199c736427556e27f94a5d055038.zip
Fix up the tests I added for string exceptions to be skipped when exceptions are disabled
llvm-svn: 258279
Diffstat (limited to 'libcxx/test/std/strings/basic.string/string.modifiers/string_assign')
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
index 690aebd4c2a..de43b408f14 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
@@ -161,6 +161,7 @@ int main()
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#endif
+#ifndef TEST_HAS_NO_EXCEPTIONS
{ // test iterator operations that throw
typedef std::string S;
typedef ThrowingIterator<char> TIter;
@@ -174,4 +175,5 @@ int main()
test_exceptions(S(), TIter(s, s+10, 5, TIter::TADereference), TIter());
test_exceptions(S(), TIter(s, s+10, 6, TIter::TAComparison), TIter());
}
+#endif
}
OpenPOWER on IntegriCloud