From: Yao Qi <yao.qi@linaro.org>
Date: Tue, 1 Mar 2016 15:15:58 +0000 (+0000)
Subject: Fix output path for arm-disp-step.exp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=30ca9da1193ec4c82cc67a2ec2e6fb6adac7ab84;p=binutils-gdb.git

Fix output path for arm-disp-step.exp

This patch fixes the following error,

ERROR: (/scratch/yao/gdb/build-git/arm-linux-gnueabihf/gdb/testsuite/outputs/gdb.arch/arm-disp-step/arm-disp-step) No such file or directory
FAIL: gdb.arch/arm-disp-step.exp: Can't run to main

gdb/testsuite:

2016-03-01  Yao Qi  <yao.qi@linaro.org>

	* gdb.arch/arm-disp-step.exp: Use standard_testfile and
	prepare_for_testing.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 828b49864f2..d77645a3450 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-01  Yao Qi  <yao.qi@linaro.org>
+
+	* gdb.arch/arm-disp-step.exp: Use standard_testfile and
+	prepare_for_testing.
+
 2016-03-01  Yao Qi  <yao.qi@linaro.org>
 
 	* gdb.arch/arm-neon.exp: Pass quiet to prepare_for_testing.
diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp
index 873c440a277..f6bef7997c4 100644
--- a/gdb/testsuite/gdb.arch/arm-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp
@@ -22,14 +22,11 @@ if {![is_aarch32_target]} then {
     return
 }
 
-set testfile "arm-disp-step"
-set srcfile ${testfile}.S
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .S
 
 set additional_flags "-Wa,-g"
 
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
-    untested arm-disp-step.exp
+if { [prepare_for_testing $testfile.exp $testfile $srcfile [list debug $additional_flags]] } {
     return -1
 }
 
@@ -410,10 +407,6 @@ proc test_add_rn_pc {} {
     gdb_assert { [expr {$pc_val + 4 + 4} == $r3_val] }
 }
 
-# Get things started.
-
-clean_restart ${testfile}
-
 # Turn displaced stepping off before runto main. When displaced stepping
 # is on, and we type 'run', GDB will first try to single step on _dl_debug_state,
 # which is in library might be compiled in Thumb.