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

Guard libc++ specific c.__invariants() tests in LIBCPP_ASSERT macros

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@267947 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-04-28 22:28:23 +00:00
parent bda804ea25
commit 375e2f669c
101 changed files with 390 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/std/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
View File

@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
// UNSUPPORTED: c++98, c++03
// <string>
// basic_string& append(initializer_list<charT> il);
@@ -14,23 +16,20 @@
#include <string>
#include <cassert>
#include "test_macros.h"
#include "min_allocator.h"
int main()
{
#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
{
std::string s("123");
s.append({'a', 'b', 'c'});
assert(s == "123abc");
}
#if TEST_STD_VER >= 11
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
S s("123");
s.append({'a', 'b', 'c'});
assert(s == "123abc");
}
#endif
#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
}

4
test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
View File

@@ -23,7 +23,7 @@ void
test(S s, It first, It last, S expected)
{
s.append(first, last);
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(s == expected);
}
@@ -38,7 +38,7 @@ test_exceptions(S s, It first, It last)
assert(false);
}
catch (...) {}
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(s == aCopy);
}
#endif

3
test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
View File

@@ -15,6 +15,7 @@
#include <stdexcept>
#include <cassert>
#include "test_macros.h"
#include "min_allocator.h"
template <class S>
@@ -22,7 +23,7 @@ void
test(S s, const typename S::value_type* str, S expected)
{
s.append(str);
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(s == expected);
}

3
test/std/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
View File

@@ -16,6 +16,7 @@
#include <stdexcept>
#include <cassert>
#include "test_macros.h"
#include "min_allocator.h"
template <class S>
@@ -23,7 +24,7 @@ void
test(S s, const typename S::value_type* str, typename S::size_type n, S expected)
{
s.append(str, n);
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(s == expected);
}

3
test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
View File

@@ -14,6 +14,7 @@
#include <string>
#include <cassert>
#include "test_macros.h"
#include "min_allocator.h"
template <class S>
@@ -21,7 +22,7 @@ void
test(S s, typename S::value_type c, S expected)
{
s.push_back(c);
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(s == expected);
}

3
test/std/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
View File

@@ -15,6 +15,7 @@
#include <string>
#include <cassert>
#include "test_macros.h"
#include "min_allocator.h"
template <class S>
@@ -22,7 +23,7 @@ void
test(S s, typename S::size_type n, typename S::value_type c, S expected)
{
s.append(n, c);
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(s == expected);
}

3
test/std/strings/basic.string/string.modifiers/string_append/string.pass.cpp
View File

@@ -15,6 +15,7 @@
#include <string>
#include <cassert>
#include "test_macros.h"
#include "min_allocator.h"
template <class S>
@@ -22,7 +23,7 @@ void
test(S s, S str, S expected)
{
s.append(str);
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(s == expected);
}

5
test/std/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <stdexcept>
#include <cassert>
#include "test_macros.h"
#include "min_allocator.h"
template <class S>
@@ -27,7 +28,7 @@ test(S s, S str, typename S::size_type pos, typename S::size_type n, S expected)
try
{
s.append(str, pos, n);
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(pos <= str.size());
assert(s == expected);
}
@@ -44,7 +45,7 @@ test_npos(S s, S str, typename S::size_type pos, S expected)
try
{
s.append(str, pos);
assert(s.__invariants());
LIBCPP_ASSERT(s.__invariants());
assert(pos <= str.size());
assert(s == expected);
}