Update Copyright year range in all files maintained by GDB.

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.ada / formatted_ref.exp

diff --git a/gdb/testsuite/gdb.ada/formatted_ref.exp b/gdb/testsuite/gdb.ada/formatted_ref.exp
index 0fe5c8dd7c7b478e1e40e49597b666ddb95da8b7..3ae7fe9df0f97a1b3597882c5e4fd748b24f4261 100644 (file)
--- a/gdb/testsuite/gdb.ada/formatted_ref.exp
+++ b/gdb/testsuite/gdb.ada/formatted_ref.exp
@@ -1,4 +1,4 @@
-# Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2007-2014 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
@@ -24,19 +24,10 @@
 # work properly: condition expression using a reference object as one of its
 # operand.
 
-if $tracelevel then {
-       strace $tracelevel
-}
-
 load_lib "ada.exp"
 
-set testdir "formatted_ref"
-set testfile "${testdir}/formatted_ref"
-set srcfile ${srcdir}/${subdir}/${testfile}.adb
-set binfile ${objdir}/${subdir}/${testfile}
-
+standard_ada_testfile formatted_ref
 
-file mkdir ${objdir}/${subdir}/${testdir}
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
     untested formatted-ref.exp
     return -1
@@ -46,16 +37,13 @@ proc get_address { var } {
     global expect_out
     global gdb_prompt
 
-    send_gdb "print $var'access\n"
-    gdb_expect {
+    gdb_test_multiple "print $var'access" "address of $var" {
        -re "\\$\[0-9\]+ = \\(.*\\) (0x\[0-9a-f\]+).*$gdb_prompt $" {
             return $expect_out(1,string)
-       }
-        timeout { 
-           perror "couldn't find address of $var"
-           return ""
         }
     }
+    perror "couldn't find address of $var"
+    return ""
 }
 
 proc test_p_x { var val addr } {
@@ -96,10 +84,7 @@ proc test_p_op1_equals_op2 {op1 op2} {
     gdb_test $test "\\$\[0-9\]+ = true"
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 runto defs.adb:[gdb_get_line_number "marker here" ${testdir}/defs.adb ]