As documented at https://gcc.gnu.org/onlinedocs/gccint/Directives.html
an "xfail" is ignored for dg-do what unless what==run.

This removes five such ignored uses of xfail in the dg-do directive.
These tests are already expected to XFAIL because of the
dg-excess-errors directives (with optional target selector for the
uclibc ones).

Removing the xfail from the dg-do directive allows { target c++11 }
there instead (if appropriate).

        * testsuite/23_containers/unordered_map/requirements/53339.cc: Remove
        ignored "xfail" from { dg-do compile { xfail selector } } directive.
        * testsuite/23_containers/unordered_multimap/requirements/53339.cc:
        Likewise.
        * testsuite/26_numerics/headers/cmath/
        c99_classification_macros_c++11.cc: Likewise.
        * testsuite/26_numerics/headers/cmath/
        c99_classification_macros_c++98.cc: Likewise.
        * testsuite/26_numerics/headers/cmath/
        c99_classification_macros_c.cc: Likewise.

Tested x86_64-linux, powerpc64-linux, committed to trunk.

commit 065333c062fffbb5d349f7d11a30ab605f180706
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Mon Aug 1 14:53:43 2016 +0100

    Remove ignored "xfail" from dg-do compile directives
    
        * testsuite/23_containers/unordered_map/requirements/53339.cc: Remove
        ignored "xfail" from { dg-do compile { xfail selector } } directive.
        * testsuite/23_containers/unordered_multimap/requirements/53339.cc:
        Likewise.
        * testsuite/26_numerics/headers/cmath/
        c99_classification_macros_c++11.cc: Likewise.
        * testsuite/26_numerics/headers/cmath/
        c99_classification_macros_c++98.cc: Likewise.
        * testsuite/26_numerics/headers/cmath/
        c99_classification_macros_c.cc: Likewise.

diff --git 
a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53339.cc 
b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53339.cc
index cef863b..009cf5e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53339.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53339.cc
@@ -1,7 +1,5 @@
-// XFAIL because of PR libstdc++/55043 fix
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
-// { dg-options "-std=gnu++11" }
+// { dg-do compile { target c++11 } }
+// { dg-excess-errors "XFAIL because of PR libstdc++/55043 fix" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
 //
diff --git 
a/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/53339.cc 
b/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/53339.cc
index 2bf11a2..b9c4898 100644
--- 
a/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/53339.cc
+++ 
b/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/53339.cc
@@ -1,7 +1,5 @@
-// XFAIL because of PR libstdc++/55043 fix
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
-// { dg-options "-std=gnu++11" }
+// { dg-do compile { target c++11 } }
+// { dg-excess-errors "XFAIL because of PR libstdc++/55043 fix" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
 //
diff --git 
a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++11.cc
 
b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++11.cc
index 1638667..8db9fdb 100644
--- 
a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++11.cc
+++ 
b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++11.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++11" }
-// { dg-do compile { xfail uclibc } }
+// { dg-do compile { target c++11 } }
 // { dg-excess-errors "" { target uclibc } }
 
 #include <cmath>
diff --git 
a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++98.cc
 
b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++98.cc
index 4c4cc4e..6480f93 100644
--- 
a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++98.cc
+++ 
b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++98.cc
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-options "-std=gnu++98" }
-// { dg-do compile { xfail uclibc } }
+// { dg-do compile }
 // { dg-excess-errors "" { target uclibc } }
 
 #include <cmath>
diff --git 
a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc
 
b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc
index cbced7d..8a42db4 100644
--- 
a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc
+++ 
b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc
@@ -17,7 +17,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile { xfail uclibc } }
+// { dg-do compile }
 // { dg-excess-errors "" { target uclibc } }
 // { dg-add-options no_pch }
 

Reply via email to