LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up the tests I added for string exceptions to be skipped when exceptions are disabled

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@258279 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2016-01-20 03:19:15 +00:00
parent 14a9008568
commit 85d4c2a93f
5 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/support/test_iterators.h
View File

@@ -349,7 +349,12 @@ struct ThrowingIterator {
if (action_ == TAAssignment)
{
if (index_ == 0)
#ifndef TEST_HAS_NO_EXCEPTIONS
assert(false);
#else
throw std::runtime_error ("throw from iterator assignment");
#endif
else
--index_;
}
@@ -367,7 +372,11 @@ struct ThrowingIterator {
if (action_ == TADereference)
{
if (index_ == 0)
#ifndef TEST_HAS_NO_EXCEPTIONS
assert(false);
#else
throw std::runtime_error ("throw from iterator dereference");
#endif
else
--index_;
}
@@ -379,7 +388,11 @@ struct ThrowingIterator {
if (action_ == TAIncrement)
{
if (index_ == 0)
#ifndef TEST_HAS_NO_EXCEPTIONS
assert(false);
#else
throw std::runtime_error ("throw from iterator increment");
#endif
else
--index_;
}
@@ -399,7 +412,11 @@ struct ThrowingIterator {
if (action_ == TADecrement)
{
if (index_ == 0)
#ifndef TEST_HAS_NO_EXCEPTIONS
assert(false);
#else
throw std::runtime_error ("throw from iterator decrement");
#endif
else
--index_;
}
@@ -418,7 +435,11 @@ struct ThrowingIterator {
if (action_ == TAComparison)
{
if (index_ == 0)
#ifndef TEST_HAS_NO_EXCEPTIONS
assert(false);
#else
throw std::runtime_error ("throw from iterator comparison");
#endif
else
--index_;
}