aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-12-07 14:33:59 -0500
committerJason Merrill <jason@gcc.gnu.org>2015-12-07 14:33:59 -0500
commit122ea31075edcb60b72a3729165e41355ec441e2 (patch)
tree5cfbb3c41b670fd9b472cbe8cafa5f58823a4256 /gcc
parentb2ca46dfad0bfd7246383eeda6446ea98c4d9817 (diff)
downloadgcc-122ea31075edcb60b72a3729165e41355ec441e2.zip
gcc-122ea31075edcb60b72a3729165e41355ec441e2.tar.gz
gcc-122ea31075edcb60b72a3729165e41355ec441e2.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/Make-lang.in2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/lib/g++.exp3
4 files changed, 13 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c4daf75..7381a75 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 50a1359..d478b4a 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 baff32f..7088835 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 0b99903..755950f 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