diff --git a/gdb/testsuite/gdb.base/catch-follow-exec.c b/gdb/testsuite/gdb.base/catch-follow-exec.c
index fa68a2a34e..1a59f58aa5 100644
--- a/gdb/testsuite/gdb.base/catch-follow-exec.c
+++ b/gdb/testsuite/gdb.base/catch-follow-exec.c
@@ -1,3 +1,20 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2018 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+
#include
#include
#include
diff --git a/gdb/testsuite/gdb.base/catch-follow-exec.exp b/gdb/testsuite/gdb.base/catch-follow-exec.exp
index 0e32ed4a6f..2ccd0115e7 100644
--- a/gdb/testsuite/gdb.base/catch-follow-exec.exp
+++ b/gdb/testsuite/gdb.base/catch-follow-exec.exp
@@ -22,8 +22,8 @@ if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
return -1
}
-if { ![remote_file target exists /bin/bash] } {
- unsupported "no bash"
+if { [target_info gdb_protocol] != "" } {
+ unsupported "not native"
return
}
@@ -34,7 +34,7 @@ if { ![remote_file target exists /bin/ls] } {
proc catch_follow_exec { } {
global binfile
- global GDB
+ global gdb_spawn_id
set test "catch-follow-exec"
@@ -45,13 +45,36 @@ proc catch_follow_exec { } {
append FLAGS " -ex \"run\""
append FLAGS " -ex \"info prog\""
- catch {exec /bin/bash -c "$GDB $FLAGS"} catchlog
- send_log "$catchlog\n"
+ gdb_exit
+ if {[gdb_spawn_with_cmdline_opts "$FLAGS"] != 0} {
+ fail "spawn"
+ return
+ }
+
+ gdb_test_multiple "" "run til exit" {
+ "runtime error:" {
+ # Error in case of --enable-ubsan
+ fail "No runtime error"
+ }
+ eof {
+ set result [wait -i $gdb_spawn_id]
+ verbose $result
+
+ gdb_assert { [lindex $result 2] == 0 }
+
+ # We suspect this will be zero instead of one after fixing PR23368
+ # - "gdb goes to into background when hitting exec catchpoint with
+ # follow-exec-mode new"
+ gdb_assert { [lindex $result 3] == 1 }
+
+ # Error in case of --disable-ubsan, we get
+ # "CHILDKILLED SIGSEGV {segmentation violation}" as extra
+ # argument(s).
+ gdb_assert { [llength $result] == 4 }
+ }
- if { [regexp {No selected thread} $catchlog] } {
- pass $test
- } else {
- fail $test
+ remote_close host
+ clear_gdb_spawn_id
}
}