On 15 January 2017 at 19:22, Ville Voutilainen <ville.voutilai...@gmail.com> wrote: > Hmm, and yeah, your test uses a different throw-after number, so I > should change the tests to do the same. :)
In other words, like in the attached patch.
diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/78389.cc b/libstdc++-v3/testsuite/23_containers/list/operations/78389.cc index 3002ba6..4d8b7d2 100644 --- a/libstdc++-v3/testsuite/23_containers/list/operations/78389.cc +++ b/libstdc++-v3/testsuite/23_containers/list/operations/78389.cc @@ -57,20 +57,18 @@ int main() std::list<int> a{1, 2, 3, 4}; std::list<int> b{5, 6, 7, 8, 9, 10, 11, 12}; try { - a.merge(b, ThrowingComparator{5}); + a.merge(b, ThrowingComparator{4}); } catch (...) { } - VERIFY(a.size() == 8 && b.size() == 4); VERIFY(a.size() == std::distance(a.begin(), a.end()) && b.size() == std::distance(b.begin(), b.end())); std::list<X> ax{1, 2, 3, 4}; std::list<X> bx{5, 6, 7, 8, 9, 10, 11, 12}; - throw_after_X = 5; + throw_after_X = 4; try { ax.merge(bx); } catch (...) { } - VERIFY(ax.size() == 8 && bx.size() == 4); VERIFY(ax.size() == std::distance(ax.begin(), ax.end()) && bx.size() == std::distance(bx.begin(), bx.end())); std::list<int> ay{5, 6, 7, 8, 9, 10, 11, 12};