Remove MULTI_OBJFILE_P

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.server / server-exec-info.exp

diff --git a/gdb/testsuite/gdb.server/server-exec-info.exp b/gdb/testsuite/gdb.server/server-exec-info.exp
index 00775f1f8bf8896267f9dbf3af3618352afcf29f..a6858f4e7358826374b5ee1499d4da09fcebfccf 100644 (file)
--- a/gdb/testsuite/gdb.server/server-exec-info.exp
+++ b/gdb/testsuite/gdb.server/server-exec-info.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2019 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
@@ -15,11 +15,23 @@
 
 load_lib gdbserver-support.exp
 
+# We test for skip_shlib_tests in this test because without a main
+# exec file we only have the exec target loaded if shared libraries
+# are present.
+if {[skip_gdbserver_tests] || [skip_shlib_tests]} {
+    return
+}
+
 standard_testfile server.c
-if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] {
+if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] {
     return -1
 }
 
+# Make sure we're disconnected, in case we're testing with an
+# extended-remote board, therefore already connected.
+gdb_test "disconnect" ".*"
+
+gdb_test_no_output "set remote pid-to-exec-file-packet off"
 gdb_test "file" ".*" "file" \
         {Discard symbol table from `.*'\? \(y or n\) } "y"
 gdbserver_run ""