From 8fe79e73349eea80bdd37b6cc32cd6692d3ce0b5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 17 Aug 2016 14:39:10 +0100 Subject: [PATCH] Adjust DG directives in libstdc++ XFAIL test * testsuite/20_util/bind/ref_neg.cc: Use effective target instead of -std=gnu++11. Add -fno-show-columns to dg-options. Use dg-prune-output instead of dg-excess-errors. From-SVN: r239535 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/testsuite/20_util/bind/ref_neg.cc | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index be50c0d703f..8753299afca 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-08-17 Jonathan Wakely + * testsuite/20_util/bind/ref_neg.cc: Use effective target instead of + -std=gnu++11. Add -fno-show-columns to dg-options. Use dg-prune-output + instead of dg-excess-errors. + * testsuite/26_numerics/headers/cmath/types_std_c++0x_neg.cc: Disable test for C++17. * testsuite/experimental/chrono/value.cc: Avoid ambiguities in C++17. diff --git a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc index f1a1c7897f8..ff2dffbc4f6 100644 --- a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc +++ b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc @@ -17,8 +17,8 @@ // 20.8.9 Function template bind -// { dg-do compile } -// { dg-options "-std=gnu++11" } +// { dg-options "-fno-show-column" } +// { dg-do compile { target c++11 } } #include @@ -48,7 +48,8 @@ void test02() std::bind(&Inc::f, Inc(), std::ref(dummy))(); // { dg-error "no match" } } -// { dg-excess-errors "reasons for deduction/substitution failures" } +// Ignore the reasons for deduction/substitution failure in the headers. +// { dg-prune-output "/include/(functional|bits/invoke.h):" } int main() { -- 2.30.2