From 122ea31075edcb60b72a3729165e41355ec441e2 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 7 Dec 2015 14:33:59 -0500 Subject: [PATCH] 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 --- 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 c4daf75d394..7381a756278 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2015-12-07 Jason Merrill + + * Make-lang.in (check-c++1z, check-c++-all): Use GXX_TESTSUITE_STDS. + 2015-12-06 Jason Merrill * parser.c (struct tentative_firewall): New. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 50a13590a0d..d478b4a249f 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 baff32f2c7f..7088835fe03 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-12-07 Jason Merrill + + * lib/g++.exp: Also find -std list in GXX_TESTSUITE_STDS + environment variable. + 2015-12-07 Marek Polacek PR c/68668 diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 0b99903dd70..755950f73da 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.30.2