g++.exp: Also find -std list in GXX_TESTSUITE_STDS environment variable.

gcc/testsuite/
	* lib/g++.exp: Also find -std list in GXX_TESTSUITE_STDS
	environment variable.
gcc/cp/
	* Make-lang.in (check-c++1z, check-c++-all): Use GXX_TESTSUITE_STDS.

From-SVN: r231379

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c4daf75d3946d3c9e69d86a62717ba8f146279ce..7381a756278568757bdb512c97a7c8d14b88b9c5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-07  Jason Merrill  <jason@redhat.com>
+
+       * Make-lang.in (check-c++1z, check-c++-all): Use GXX_TESTSUITE_STDS.
+
 2015-12-06  Jason Merrill  <jason@redhat.com>
 
        * parser.c (struct tentative_firewall): New.

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 50a13590a0ddca84b3b1ff351adb8258377e7b5a..d478b4a249f850f63a3a8e313dc5bc376aa7c4d3 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -148,7 +148,7 @@ check-c++ : check-g++
 
 # Run the testsuite in C++1z mode.
 check-c++1z:
-       $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) --stds=1z" check-g++
+       $(MAKE) GXX_TESTSUITE_STDS=1z check-g++
 
 # Run the testsuite in all standard conformance levels.
 check-c++-all:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index baff32f2c7fb7a556f343e43f4a6e61b58156d64..7088835fe03111d0588fbda2a318a6e0406f8afc 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-07  Jason Merrill  <jason@redhat.com>
+
+       * lib/g++.exp: Also find -std list in GXX_TESTSUITE_STDS
+       environment variable.
+
 2015-12-07  Marek Polacek  <polacek@redhat.com>
 
        PR c/68668

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 0b99903dd70b4939d5f5ba20ae7809b1d6cf5c10..755950f73dadab8261b676cc33da6d207984f0cc 100644 (file)
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -33,6 +33,9 @@ load_lib target-libpath.exp
 
 set gpp_compile_options ""
 set gpp_std_list { }
+if [info exists env(GXX_TESTSUITE_STDS)] {
+    set gpp_std_list [split $env(GXX_TESTSUITE_STDS) ","]
+}
 
 #
 # g++_version -- extract and print the version number of the compiler