[binutils-gdb/gdb-8.0-branch] Test different follow-exec-mode settings in gdb.multi/multi-arch-exec.exp

[Simon Marchi <simark at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e8311673316b29c557dcc18a09e252de724dc910

commit e8311673316b29c557dcc18a09e252de724dc910
Author: Simon Marchi <simon.marchi@ericsson.com>
Date:   Tue Sep 5 17:40:44 2017 +0200

    Test different follow-exec-mode settings in gdb.multi/multi-arch-exec.exp
    
    Using follow-exec-mode "new" takes a different code path than "same", so
    it's interesting to test this path in combination with a change in
    architecture of the inferior.  This test fails if you remove the
    previous patch.
    
    gdb/testsuite/ChangeLog:
    
    	* gdb.multi/multi-arch-exec.exp: Test with different
    	"follow-exec-mode" settings.
    	(do_test): New procedure.

Diff:
---
 gdb/testsuite/ChangeLog                     |  6 ++++++
 gdb/testsuite/gdb.multi/multi-arch-exec.exp | 24 +++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9a656b6..06d8829 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-05  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* gdb.multi/multi-arch-exec.exp: Test with different
+	"follow-exec-mode" settings.
+	(do_test): New procedure.
+
 2017-08-28  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* gdb.base/commands.exp (user_defined_command_case_sensitivity):
diff --git a/gdb/testsuite/gdb.multi/multi-arch-exec.exp b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
index ed98532..27a0d60 100644
--- a/gdb/testsuite/gdb.multi/multi-arch-exec.exp
+++ b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
@@ -76,12 +76,22 @@ if { [prepare_for_testing "failed to prepare" ${exec2} "${srcfile2}" \
     return -1
 }
 
-clean_restart ${exec1}
-if ![runto_main] then {
-    fail "couldn't run to main"
-    return -1
+proc do_test { mode } {
+	global exec1
+
+	clean_restart ${exec1}
+	if ![runto_main] then {
+	    fail "couldn't run to main"
+	    return -1
+	}
+
+	gdb_test_no_output "set follow-exec-mode $mode"
+
+	# Test that GDB updates the target description / arch successfuly
+	# after the exec.
+	gdb_test "continue" "Breakpoint 1, main.*" "continue across exec that changes architecture"
 }
 
-# Test that GDB updates the target description / arch successfuly
-# after the exec.
-gdb_test "continue" "Breakpoint 1, main.*" "continue across exec that changes architecture"
+foreach follow_exec_mode {"same" "new"} {
+    do_test $follow_exec_mode
+}