mirror of
https://github.com/llvm-mirror/libcxx.git
synced 2025-10-23 01:18:52 +08:00
Protect exceptional paths under libcpp-no-exceptions
These tests are of the form try { action-that-may-throw assert(!exceptional-condition) assert(some-other-facts) } catch (relevant-exception) { assert(exceptional-condition) } Under libcpp-no-exceptions there is still value in verifying some-other-facts while avoiding the exceptional case. So for these tests just conditionally check some-other-facts if exceptional-condition is false. When exception are supported make sure that a true exceptional-condition throws an exception Differential Revision: https://reviews.llvm.org/D26136 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@285697 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// XFAIL: libcpp-no-exceptions
|
||||
// <string>
|
||||
|
||||
// void reserve(size_type res_arg=0);
|
||||
@@ -38,18 +37,27 @@ test(S s, typename S::size_type res_arg)
|
||||
{
|
||||
typename S::size_type old_cap = s.capacity();
|
||||
S s0 = s;
|
||||
try
|
||||
if (res_arg <= s.max_size())
|
||||
{
|
||||
s.reserve(res_arg);
|
||||
assert(res_arg <= s.max_size());
|
||||
assert(s == s0);
|
||||
assert(s.capacity() >= res_arg);
|
||||
assert(s.capacity() >= s.size());
|
||||
}
|
||||
catch (std::length_error&)
|
||||
#ifndef TEST_HAS_NO_EXCEPTIONS
|
||||
else
|
||||
{
|
||||
assert(res_arg > s.max_size());
|
||||
try
|
||||
{
|
||||
s.reserve(res_arg);
|
||||
assert(false);
|
||||
}
|
||||
catch (std::length_error&)
|
||||
{
|
||||
assert(res_arg > s.max_size());
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
int main()
|
||||
|
Reference in New Issue
Block a user