Index: gdb/testsuite/gdb.base/structs.exp |
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp |
index d98b7f30e7f38b30c8afcabe3e235132d0ace10d..1fe4c28b1e4510516029573d6f6f5adb2e9981be 100644 |
--- a/gdb/testsuite/gdb.base/structs.exp |
+++ b/gdb/testsuite/gdb.base/structs.exp |
@@ -1,7 +1,6 @@ |
# This testcase is part of GDB, the GNU debugger. |
-# Copyright 1996-1997, 1999, 2003-2004, 2007-2012 Free Software |
-# Foundation, Inc. |
+# Copyright 1996-2013 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 |
@@ -26,9 +25,7 @@ if [target_info exists gdb,cannot_call_functions] { |
continue |
} |
-set testfile "structs" |
-set srcfile ${testfile}.c |
-set binfile ${objdir}/${subdir}/${testfile} |
+standard_testfile .c |
# Regex matching any value of `char' type like: a = 65 'A' |
set anychar_re {-?[0-9]{1,3} '(.|\\([0-7]{3}|[a-z]|\\|'))'} |
@@ -37,7 +34,7 @@ set anychar_re {-?[0-9]{1,3} '(.|\\([0-7]{3}|[a-z]|\\|'))'} |
# compiler used to compile the test case. |
if [get_compiler_info] { |
- return -1; |
+ return -1 |
} |
# Compile a variant of structs.c using TYPES to specify the type of |
@@ -50,7 +47,6 @@ proc start_structs_test { types } { |
global testfile |
global srcfile |
global binfile |
- global objdir |
global subdir |
global srcdir |
global gdb_prompt |
@@ -68,7 +64,7 @@ proc start_structs_test { types } { |
append testfile "-" "$t" |
} |
- set binfile ${objdir}/${subdir}/${testfile} |
+ set binfile [standard_output_file ${testfile}] |
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags}"] != "" } { |
# built the second test case since we can't use prototypes |
warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES" |
@@ -92,7 +88,7 @@ proc start_structs_test { types } { |
# Advance to main |
if { ![runto_main] } then { |
- gdb_suppress_tests; |
+ gdb_suppress_tests |
} |
# Get the debug format |