g++-dg.exp (g++-dg-runtest): Change -std=c++1y to -std=c++14.

	* lib/g++-dg.exp (g++-dg-runtest): Change -std=c++1y to -std=c++14.
	* lib/target-supports.exp (check_effective_target_c++14_only): Likewise.

From-SVN: r217085

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2b4ef77914aeea45aac89dbf1235e855de07406b..4c563cc69242dfd0387bbe737b70e3e6d20407cf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-04  Jason Merrill  <jason@redhat.com>
+
+       * lib/g++-dg.exp (g++-dg-runtest): Change -std=c++1y to -std=c++14.
+       * lib/target-supports.exp (check_effective_target_c++14_only): Likewise.
+
 2014-11-04  Andrew Stubbs  <ams@codesourcery.com>
 
        gcc/testsuite/

diff --git a/gcc/testsuite/lib/g++-dg.exp b/gcc/testsuite/lib/g++-dg.exp
index 308f3062038b6d838b25955a37843def67e836ad..8f79cbf29e6d94d58c2e366306f82ae18adc0091 100644 (file)
--- a/gcc/testsuite/lib/g++-dg.exp
+++ b/gcc/testsuite/lib/g++-dg.exp
@@ -43,9 +43,9 @@ proc g++-dg-runtest { testcases flags default-extra-flags } {
        # if there's a dg-options line.
        if ![search_for $test "-std=*++"] {
            if [search_for $test "dg-options"] {
-               set option_list { -std=gnu++98 -std=gnu++11 -std=gnu++1y }
+               set option_list { -std=gnu++98 -std=gnu++11 -std=gnu++14 }
            } else {
-               set option_list { -std=c++98 -std=c++11 -std=c++1y }
+               set option_list { -std=c++98 -std=c++11 -std=c++14 }
            }
        } else {
            set option_list { "" }

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 3361c2f9e8d98c5d1cc194617db6281127db2277..e5b04ec5f9057f24f63e43020a24309a384e311a 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -5706,7 +5706,7 @@ proc check_effective_target_c++14_only { } {
     if ![check_effective_target_c++] {
        return 0
     }
-    return [check-flags { { } { } { -std=c++1y -std=gnu++1y -std=c++14 -std=gnu++14 } }]
+    return [check-flags { { } { } { -std=c++14 -std=gnu++14 -std=c++14 -std=gnu++14 } }]
 }
 
 proc check_effective_target_c++14 { } {