Implement pahole-like 'ptype /o' option

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / longjmp.exp

diff --git a/gdb/testsuite/gdb.base/longjmp.exp b/gdb/testsuite/gdb.base/longjmp.exp
index da8f4849076873997f45b3839721ffdc33f4b35d..c536d51381a96d930a516815478dfbaa29041451 100644 (file)
--- a/gdb/testsuite/gdb.base/longjmp.exp
+++ b/gdb/testsuite/gdb.base/longjmp.exp
@@ -1,4 +1,4 @@
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008-2017 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
@@ -17,33 +17,22 @@
 # Test support for stepping over longjmp.
 #
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
 
-set testfile "longjmp"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested longjmp.exp
+     untested "failed to compile"
      return -1
 }
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
@@ -75,12 +64,12 @@ gdb_test "next" "longjmp \\(env, 1\\);.*" "next to longjmp (1)"
 
 set msg "next over longjmp(1)"
 gdb_test_multiple "next" $msg {
-    -re ".*patt1.*" {
+    -re ".*patt1.*$gdb_prompt $" {
        pass $msg
        gdb_test "next" "resumes\\+\\+.*" "next into else block (1)"
        gdb_test "next" "miss_step_1.*" "next into safety net (1)"
     }
-    -re "miss_step_1.*" {
+    -re "miss_step_1.*$gdb_prompt $" {
        fail $msg
     }
 }
@@ -105,13 +94,13 @@ gdb_test "next" "call_longjmp.*" "next over setjmp (2)"
 
 set msg "next over call_longjmp (2)"
 gdb_test_multiple "next" $msg {
-    -re ".*patt2.*" {
+    -re ".*patt2.*$gdb_prompt $" {
        pass $msg
 
        gdb_test "next" "resumes\\+\\+.*" "next into else block (2)"
        gdb_test "next" "miss_step_2.*" "next into safety net (2)"
     }
-    -re "miss_step_2.*" {
+    -re "miss_step_2.*$gdb_prompt $" {
        fail $msg
     }
 }