diff options
Diffstat (limited to 'libcxx/test/std/containers')
4 files changed, 24 insertions, 12 deletions
diff --git a/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp index aa87e9ff07a..cc22a4c34fb 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp @@ -178,15 +178,18 @@ int main(int, char**) M m3(std::move(m1), A()); assert(m3 == m2); LIBCPP_ASSERT(m1.empty()); - assert(Counter_base::gConstructed == num+6); + assert(Counter_base::gConstructed >= (int)(num+6)); + assert(Counter_base::gConstructed <= (int)(num+6+m1.size())); { M m4(std::move(m2), A(5)); - assert(Counter_base::gConstructed == num+6); + assert(Counter_base::gConstructed >= (int)(num+6)); + assert(Counter_base::gConstructed <= (int)(num+6+m1.size()+m2.size())); assert(m4 == m3); LIBCPP_ASSERT(m2.empty()); } - assert(Counter_base::gConstructed == num+3); + assert(Counter_base::gConstructed >= (int)(num+3)); + assert(Counter_base::gConstructed <= (int)(num+3+m1.size()+m2.size())); } assert(Counter_base::gConstructed == 0); } diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp index 712afbeaa6a..4505cd216ac 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp @@ -178,15 +178,18 @@ int main(int, char**) M m3(std::move(m1), A()); assert(m3 == m2); LIBCPP_ASSERT(m1.empty()); - assert(Counter_base::gConstructed == 3*num); + assert(Counter_base::gConstructed >= (int)(3*num)); + assert(Counter_base::gConstructed <= (int)(4*num)); { M m4(std::move(m2), A(5)); - assert(Counter_base::gConstructed == 3*num); + assert(Counter_base::gConstructed >= (int)(3*num)); + assert(Counter_base::gConstructed <= (int)(5*num)); assert(m4 == m3); LIBCPP_ASSERT(m2.empty()); } - assert(Counter_base::gConstructed == 2*num); + assert(Counter_base::gConstructed >= (int)(2*num)); + assert(Counter_base::gConstructed <= (int)(4*num)); } assert(Counter_base::gConstructed == 0); } diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp index 1abe5b928b5..3727c143dce 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp @@ -172,15 +172,18 @@ int main(int, char**) M m3(std::move(m1), A()); assert(m3 == m2); LIBCPP_ASSERT(m1.empty()); - assert(Counter_base::gConstructed == 3*num); + assert(Counter_base::gConstructed >= (int)(3*num)); + assert(Counter_base::gConstructed <= (int)(4*num)); { M m4(std::move(m2), A(5)); - assert(Counter_base::gConstructed == 3*num); + assert(Counter_base::gConstructed >= (int)(3*num)); + assert(Counter_base::gConstructed <= (int)(5*num)); assert(m4 == m3); LIBCPP_ASSERT(m2.empty()); } - assert(Counter_base::gConstructed == 2*num); + assert(Counter_base::gConstructed >= (int)(2*num)); + assert(Counter_base::gConstructed <= (int)(4*num)); } assert(Counter_base::gConstructed == 0); } diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp index db7933e92b8..63ec296892b 100644 --- a/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp @@ -172,15 +172,18 @@ int main(int, char**) M m3(std::move(m1), A()); assert(m3 == m2); LIBCPP_ASSERT(m1.empty()); - assert(Counter_base::gConstructed == 6+num); + assert(Counter_base::gConstructed >= (int)(6+num)); + assert(Counter_base::gConstructed <= (int)(m1.size()+6+num)); { M m4(std::move(m2), A(5)); - assert(Counter_base::gConstructed == 6+num); + assert(Counter_base::gConstructed >= (int)(6+num)); + assert(Counter_base::gConstructed <= (int)(m1.size()+m2.size()+6+num)); assert(m4 == m3); LIBCPP_ASSERT(m2.empty()); } - assert(Counter_base::gConstructed == 3+num); + assert(Counter_base::gConstructed >= (int)(3+num)); + assert(Counter_base::gConstructed <= (int)(m1.size()+m2.size()+3+num)); } assert(Counter_base::gConstructed == 0); } |
