Skip C tests if test flags include C++ options

Backport from mainline
2016-08-02  Jonathan Wakely  <jwakely@redhat.com>

	* testsuite/18_support/bad_exception/23591_thread-1.c: Skip test if
	options are present that aren't valid for C.
	* testsuite/abi/header_cxxabi.c: Likewise.

From-SVN: r248238

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4da56ad76e3fefca2fcfc50a1b335cd5d6b49c69..f597b1666b8a12685c9ec97b9547e2936f7a7556 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2017-05-18  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2016-08-02  Jonathan Wakely  <jwakely@redhat.com>
+
+       * testsuite/18_support/bad_exception/23591_thread-1.c: Skip test if
+       options are present that aren't valid for C.
+       * testsuite/abi/header_cxxabi.c: Likewise.
+
        Backport from mainline
        2017-04-24  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c b/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c
index c460ca91c7129cca1eed633abb3d9ca6142830de..4d65507b3e10a70af5f15333c27f8c840db6e629 100644 (file)
--- a/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c
+++ b/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c
@@ -1,4 +1,5 @@
 // { dg-require-sharedlib "" }
+// { dg-skip-if "invalid options for C" { *-*-* } { "-std=c++??" "-std=gnu++??" } }
 // { dg-options "-g -O2 -pthread -ldl -x c -fvtable-verify=none" { target *-*-linux* *-*-gnu* } }
 
 // Copyright (C) 2005-2015 Free Software Foundation, Inc.

diff --git a/libstdc++-v3/testsuite/abi/header_cxxabi.c b/libstdc++-v3/testsuite/abi/header_cxxabi.c
index db4171ea1f85618d6b21caa24fc0dcbc6da29878..dfef27fdc5cf9f430eb835d060fd7c5dbf8c92e9 100644 (file)
--- a/libstdc++-v3/testsuite/abi/header_cxxabi.c
+++ b/libstdc++-v3/testsuite/abi/header_cxxabi.c
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-skip-if "invalid options for C" { *-*-* } { "-std=c++??" "-std=gnu++??" } }
 // { dg-options "-x c" }
 // Copyright (C) 2006-2015 Free Software Foundation, Inc.
 //