Fix more cases of improper test names

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

diff --git a/gdb/testsuite/gdb.server/server-mon.exp b/gdb/testsuite/gdb.server/server-mon.exp
index ca9ee3ed69a99350b5ed8f283ee17fb7180145ca..3e293eba6d35d95a51784313bc4434ce1c911e31 100644 (file)
--- a/gdb/testsuite/gdb.server/server-mon.exp
+++ b/gdb/testsuite/gdb.server/server-mon.exp
@@ -1,6 +1,6 @@
 # This testcase is part of GDB, the GNU debugger.
 
-# Copyright 2007-2012 Free Software Foundation, Inc.
+# Copyright 2007-2016 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
@@ -19,23 +19,16 @@
 
 load_lib gdbserver-support.exp
 
-set testfile "server"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/server-mon
+standard_testfile server.c
 
 if { [skip_gdbserver_tests] } {
     return 0
 }
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_load $binfile
-gdb_reinitialize_dir $srcdir/$subdir
-
 # Make sure we're disconnected, in case we're testing with an
 # extended-remote board, therefore already connected.
 gdb_test "disconnect" ".*"
@@ -57,3 +50,7 @@ gdb_test "monitor set debug 1" "Debug output enabled\\."
 gdb_test "monitor set debug 0" "Debug output disabled\\."
 gdb_test "monitor set remote-debug 1" "Protocol debug output enabled\\."
 gdb_test "monitor set remote-debug 0" "Protocol debug output disabled\\."
+gdb_test "monitor set debug-format all" \
+    "All extra debug format options enabled\\."
+gdb_test "monitor set debug-format none" \
+    "All extra debug format options disabled\\."