1 files changed, 24 insertions, 13 deletions
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
index a508bde..d2874ba 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
@@ -25,25 +25,36 @@ if {![istarget *-*-linux*]
 }
 
 set testfile "dw2-ref-missing-frame"
-set sources [list ${testfile}-main.c ${testfile}.S]
+set srcsfile ${testfile}.S
+set objsfile ${objdir}/${subdir}/${testfile}.o
+set srcfuncfile ${testfile}-func.c
+set objfuncfile ${objdir}/${subdir}/${testfile}-func.o
+set srcmainfile ${testfile}-main.c
+set objmainfile ${objdir}/${subdir}/${testfile}-main.o
+set executable ${testfile}
+set binfile ${objdir}/${subdir}/${executable}
 
-# First try referencing DW_AT_frame_base which is not defined.
-set executable_nofb ${testfile}-nofb
-if { [prepare_for_testing ${testfile}.exp $executable_nofb $sources {nodebug additional_flags=-DNO_FRAME_BASE}] } {
+if { [gdb_compile "${srcdir}/${subdir}/${srcsfile}" $objsfile object {}] != ""
+     || [gdb_compile "${srcdir}/${subdir}/${srcfuncfile}" $objfuncfile object {}] != ""
+     || [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" $objmainfile object {debug}] != ""
+     || [gdb_compile "$objsfile $objfuncfile $objmainfile" $binfile executable {}] != "" } {
     return -1
 }
 
-if [runto_main] {
-    gdb_test "p main_var" {Could not find the frame base for "main".}
+clean_restart $executable
+
+# First try referencing DW_AT_frame_base which is not defined.
+if [runto func_nofb] {
+    gdb_test "p func_nofb_var" {Could not find the frame base for "func_nofb".} "func_nofb print"
+    gdb_test "bt full" " in main .* main_var = 1" "func_nofb backtrace"
 }
 
+# GDB could have crashed.
+clean_restart $executable
+
 # And now try referencing DW_AT_frame_base defined using a self-reference
 # (DW_OP_fbreg).
-set executable_fb ${testfile}-fb
-if { [prepare_for_testing ${testfile}.exp $executable_fb $sources {nodebug}] } {
-    return -1
-}
-
-if [runto_main] {
-    gdb_test "p main_var" "DWARF-2 expression error: Loop detected .*"
+if [runto func_loopfb] {
+    gdb_test "p func_loopfb_var" "DWARF-2 expression error: Loop detected .*" "func_loopfb print"
+    gdb_test "bt full" " in main .* main_var = 1" "func_loopfb backtrace"
 }