From 03af97e19f452f8a718509b5fb03fd8ef5eef6c5 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 7 Dec 2015 19:33:59 +0000
Subject: [PATCH] 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231379 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog          | 4 ++++
 gcc/cp/Make-lang.in       | 2 +-
 gcc/testsuite/ChangeLog   | 5 +++++
 gcc/testsuite/lib/g++.exp | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c4daf75d3946..7381a7562785 100644
--- 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 50a13590a0dd..d478b4a249f8 100644
--- 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 baff32f2c7fb..7088835fe031 100644
--- 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 0b99903dd70b..755950f73dad 100644
--- 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
-- 
2.47.2