From 669d0468399d8375f4d25289938a0c06d12e7f2e Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Tue, 21 May 2019 16:32:41 +0200
Subject: [PATCH] [gdb/testsuite] Require c++11 where necessary

When building gdb on ubuntu 16.04 with gcc 5.4.0, and running the gdb
testsuite we run into failures due test-cases requiring at least c++1.

Fix this by adding -std=c++11 to those test-cases.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2019-05-21  Tom de Vries  <tdevries@suse.de>

	* gdb.arch/amd64-eval.exp: Require c++11.
	* gdb.base/max-depth.exp: Same.
	* gdb.compile/compile-cplus-array-decay.exp: Same.
	* gdb.cp/meth-typedefs.exp: Same.
	* gdb.cp/subtypes.exp: Same.
	* gdb.cp/temargs.exp: Same.
---
 gdb/testsuite/ChangeLog                                 | 9 +++++++++
 gdb/testsuite/gdb.arch/amd64-eval.exp                   | 2 +-
 gdb/testsuite/gdb.base/max-depth.exp                    | 3 +++
 gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp | 2 +-
 gdb/testsuite/gdb.cp/meth-typedefs.exp                  | 3 ++-
 gdb/testsuite/gdb.cp/subtypes.exp                       | 3 ++-
 gdb/testsuite/gdb.cp/temargs.exp                        | 3 ++-
 7 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 176b7f74be..4060eadfbd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-05-21  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.arch/amd64-eval.exp: Require c++11.
+	* gdb.base/max-depth.exp: Same.
+	* gdb.compile/compile-cplus-array-decay.exp: Same.
+	* gdb.cp/meth-typedefs.exp: Same.
+	* gdb.cp/subtypes.exp: Same.
+	* gdb.cp/temargs.exp: Same.
+
 2019-05-21  Alan Hayward  <alan.hayward@arm.com>
 
 	* lib/gdbserver-support.exp (gdbserver_run): Mark kill as optional.
diff --git a/gdb/testsuite/gdb.arch/amd64-eval.exp b/gdb/testsuite/gdb.arch/amd64-eval.exp
index beef46ad13..4b5c28e7ce 100644
--- a/gdb/testsuite/gdb.arch/amd64-eval.exp
+++ b/gdb/testsuite/gdb.arch/amd64-eval.exp
@@ -20,7 +20,7 @@
 standard_testfile .cc
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
-	  { debug c++ }] } {
+	  { debug c++ additional_flags=-std=c++11 }] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/max-depth.exp b/gdb/testsuite/gdb.base/max-depth.exp
index b3b78762eb..99f3c98d8f 100644
--- a/gdb/testsuite/gdb.base/max-depth.exp
+++ b/gdb/testsuite/gdb.base/max-depth.exp
@@ -39,6 +39,9 @@ proc compile_and_run_tests { lang } {
     # Create the additional flags.
     set flags "debug"
     lappend flags $lang
+    if { "$lang" == "c++" } {
+	lappend flags "additional_flags=-std=c++11"
+    }
 
     set dir "$lang"
     set binfile [standard_output_file ${dir}/${testfile}]
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
index 80be4c2ac6..2f2f1c31af 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
@@ -25,7 +25,7 @@ if {[skip_cplus_tests]} {
 }
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
-	 {debug nowarnings c++}]} {
+	 {debug nowarnings c++ additional_flags=-std=c++11}]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/meth-typedefs.exp b/gdb/testsuite/gdb.cp/meth-typedefs.exp
index 76a8fc9780..0883154584 100644
--- a/gdb/testsuite/gdb.cp/meth-typedefs.exp
+++ b/gdb/testsuite/gdb.cp/meth-typedefs.exp
@@ -35,7 +35,8 @@ if {[skip_cplus_tests]} { continue }
 # Tests for c++/12266 et al
 standard_testfile .cc
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}]} {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
+	 {c++ debug additional_flags=-std=c++11}]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/subtypes.exp b/gdb/testsuite/gdb.cp/subtypes.exp
index 913006cf50..a0b6bcd0ef 100644
--- a/gdb/testsuite/gdb.cp/subtypes.exp
+++ b/gdb/testsuite/gdb.cp/subtypes.exp
@@ -23,7 +23,8 @@ load_lib "cp-support.exp"
 standard_testfile .cc subtypes-2.cc
 
 if {[prepare_for_testing "failed to prepare" $testfile \
-	 [list $srcfile $srcfile2] {debug c++}]} {
+	 [list $srcfile $srcfile2] \
+	 {debug c++ additional_flags=-std=c++11}]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/temargs.exp b/gdb/testsuite/gdb.cp/temargs.exp
index 702e972ed6..a1fbaf1d11 100644
--- a/gdb/testsuite/gdb.cp/temargs.exp
+++ b/gdb/testsuite/gdb.cp/temargs.exp
@@ -23,7 +23,8 @@ if {[skip_cplus_tests]} {
 
 standard_testfile .cc
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
+	 {debug c++ additional_flags=-std=c++11}]} {
     return -1
 }
 
-- 
2.34.1