Clarify "list" output when specified lines are ambiguous
[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / call-ar-st.exp
index 925d2af33792e586d5660d36052ed9086807d368..65329f2d354cf4dc6049949b016f40605878c245 100644 (file)
@@ -1,4 +1,4 @@
-#   Copyright 1998-2013 Free Software Foundation, Inc.
+#   Copyright 1998-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
 
 
 
-set testfile "call-ar-st"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
-# Test depends on printf, which the sparclet stub doesn't support.  
-if { [istarget "sparclet-*-*"] } {
-    return 0
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
-    return -1
+# Some targets can't call functions, so don't even bother with this
+# test.
+if [target_info exists gdb,cannot_call_functions] {
+    unsupported "this target can not call functions"
+    continue
 }
 
-
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 
@@ -39,23 +33,16 @@ if [get_compiler_info] {
     return -1
 }
 
-# Some targets can't call functions, so don't even bother with this
-# test.
-if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*" 2416
-    fail "This target can not call functions"
-    continue
+set skip_float_test [gdb_skip_float_test]
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+    return -1
 }
 
+
 set oldtimeout $timeout
 set timeout [expr "$timeout + 60"]
 
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
 gdb_test_no_output "set print sevenbit-strings"
 gdb_test_no_output "set print address off"
 gdb_test_no_output "set width 0"
@@ -68,57 +55,56 @@ if ![runto_main] then {
 
 get_debug_format
 
-#go -until 1209
-gdb_test "tbreak 1209" \
-    "Temporary breakpoint \[0-9\]+.*file.*$srcfile, line 1209.*" \
-    "tbreakpoint line 1209"
+set stop_line [gdb_get_line_number "-tbreak1-"]
+gdb_test "tbreak $stop_line" \
+    "Temporary breakpoint ${decimal}.*file.*$srcfile, line $stop_line.*" \
+    "tbreakpoint at tbreak1"
 
 gdb_test continue \
-"Continuing\\..*main \\(\\) at.*$srcfile:1209.*" \
+"Continuing\\..*main \\(\\) at.*$srcfile:$stop_line.*" \
 "run until breakpoint set at a line"
 
 
 #call print_double_array(double_array)
-if {![gdb_skip_float_test "print print_double_array(double_array)"] && \
+if {!$skip_float_test && \
     ![gdb_skip_stdio_test "print print_double_array(double_array)"] } {
-    gdb_test_sequence "print print_double_array(double_array)" "" {
-       "\[ \t\r\n\]+array_d :"
-       "\[ \t\r\n\]+========="
-       "\[ \t\r\n\]+0.000000"
-       "\[ \t\r\n\]+23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]"
-       "\[ \t\r\n\]+"
-    }
+
+    gdb_test_stdio "print print_double_array(double_array)" \
+       [multi_line \
+            "array_d :" \
+            "=========" \
+            "" \
+            "0.000000 *" \
+            "23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]"]
 }
 
 #call print_char_array(char_array)
 
+set array_c_re \
+    [multi_line \
+        "array_c :" \
+        "=========" \
+        "" \
+        "Z" \
+        "aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ" \
+        "aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ" \
+        "aZaZaZaZaZaZaZaZaZa"]
+
 if ![gdb_skip_stdio_test "print_char_array(char_array)"] {
-    gdb_test_sequence "print print_char_array(char_array)" "" {
-       "\[ \t\r\n\]+array_c :"
-       "\[ \t\r\n\]+========="
-       "\[ \t\r\n\]+\[ \t\r\n\]+Z"
-       "\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ"
-       "\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ"
-       "\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZa\[ \t\r\n\]+\[ \t\r\n\]+"
-    }
+    gdb_test_stdio "print print_char_array(char_array)" $array_c_re
 }
 
-#go -until 1216
-gdb_test "tbreak 1216" \
-"Temporary breakpoint.*file.*$srcfile, line 1216.*" \
-"tbreakpoint line 1216"
-
-if ![gdb_skip_stdio_test "continue to 1216"] {
-    gdb_test_sequence "continue" "continue to 1216" {
-       "\[ \t\r\n\]+array_c :"
-       "\[ \t\r\n\]+========="
-       "\[ \t\r\n\]+\[ \t\r\n\]+Z"
-       "\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ"
-       "\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ"
-       "\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZa"
-       "\[ \t\r\n\]+main.*at.*:1216"
-       "\[ \t\r\n\]+1216.*print_double_array\\(double_array\\)"
-    }
+set stop_line [gdb_get_line_number "-tbreak2-"]
+gdb_test "tbreak $stop_line" \
+"Temporary breakpoint.*file.*$srcfile, line $stop_line.*" \
+"tbreakpoint at tbreak2"
+
+if ![gdb_skip_stdio_test "continue to tbreak2"] {
+    set gdb_re \
+       [multi_line \
+            "main.*at.*:\[0-9\]+" \
+            "\[0-9\]+.*print_double_array\\(double_array\\).*"]
+    gdb_test_stdio "continue" $array_c_re $gdb_re "continue to tbreak2"
 } else {
     gdb_test "continue" ".*" ""
 }
@@ -136,71 +122,84 @@ if ![gdb_skip_stdio_test "continue to 1216"] {
 #  }
 
 #set timeout $oldtimeout
-#go -until 1220
-gdb_test "tbreak 1220" \
-       "Temporary breakpoint.* file .*$srcfile, line 1220.*" \
-       "tbreakpoint line 1220"
-
-if {![gdb_skip_float_test "continuing to breakpoint 1220"] && \
-    ![gdb_skip_stdio_test "continuing to breakpoint 1220"] } {
-    gdb_test_sequence "continue" "continuing to breakpoint 1220" {
-       "Continuing\\."
-       "\[ \t\r\n\]+array_d :"
-       "\[ \t\r\n\]+========="
-       "\[ \t\r\n\]+0.000000"
-       "\[ \t\r\n\]+23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]*"
-       "\[ \t\r\n\]+"
-       "array_f :"
-       "student id :\[\t \]+.*YELLOW"
-       "array_i :"
-       "main \\(\\) at .*call-ar-st.c:1220\[ \t\r\n\]+.*print_all_arrays\\(integer_array, char_array, float_array, double_array\\)."
-    }
+set stop_line [gdb_get_line_number "-tbreak3-"]
+gdb_test "tbreak $stop_line" \
+       "Temporary breakpoint.* file .*$srcfile, line $stop_line.*" \
+       "tbreakpoint at tbreak3"
+
+if {!$skip_float_test && \
+    ![gdb_skip_stdio_test "continuing to tbreak3"] } {
+
+    gdb_test_stdio "continue" \
+       [multi_line \
+            "array_d :" \
+            "=========" \
+            "" \
+            "0.000000 *" \
+            "23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]* *" \
+            "" \
+            "" \
+            "array_f :" \
+            ".*" \
+            "student id :\[\t \]+.*YELLOW" \
+            "array_i :" \
+           ] \
+       "main \\(\\) at .*call-ar-st.c:\[0-9\]+\[ \t\r\n\]+.*print_all_arrays\\(integer_array, char_array, float_array, double_array\\)..*" \
+       "continuing to tbreak3"
+
 } else {
     gdb_test "continue" ".*" ""
 }
 
 #step
+set stop_line [gdb_get_line_number "-step1-"]
 gdb_test "step" \
-    "print_all_arrays \\(array_i=<integer_array.*>, array_c=<char_array.*> .ZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZa., array_f=<float_array.*>, array_d=<double_array.*>\\) at .*call-ar-st.c:306\[ \t\r\n\]+306.*print_int_array\\(array_i\\);.*" \
+    "print_all_arrays \\(array_i=<integer_array.*>, array_c=<char_array.*> .ZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZa., array_f=<float_array.*>, array_d=<double_array.*>\\) at .*$srcfile:$stop_line\[ \t\r\n\]+$stop_line.*print_int_array\\(array_i\\);.*" \
     "step inside print_all_arrays"
 
 #step -over
 if ![gdb_skip_stdio_test "next over print_int_array in print_all_arrays"] {
-    gdb_test "next" \
-       "array_i :.*307.*print_char_array.*" \
+    set stop_line [gdb_get_line_number "-next1-"]
+    gdb_test_stdio "next" \
+       "array_i :" \
+       "$stop_line.*print_char_array.*" \
        "next over print_int_array in print-all_arrays"
 } else {
     gdb_test "next" ".*" ""
 }
 
 #call print_double_array(array_d)
-if {![gdb_skip_float_test "print print_double_array(array_d)"] && \
+if {!$skip_float_test && \
     ![gdb_skip_stdio_test "print print_double_array(array_d)"] } {
-    gdb_test_sequence "print print_double_array(array_d)" "" {
-       "array_d :"
-       "\[ \t\r\n\]+========="
-       "\[ \t\r\n\]+\[ \t\r\n\]+0.000000"
-       "\[ \t\r\n\]+23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]*"
-       "\[ \t\r\n\]+"
-    }
+
+    gdb_test_stdio "print print_double_array(array_d)" \
+       [multi_line \
+            "array_d :" \
+            "=========" \
+            "" \
+            "0.000000 *" \
+            "23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]*" \
+           ]
 }
 
-#go -until 1236
-gdb_test "tbreak 1236" \
-"Temporary breakpoint.* file .*$srcfile, line 1236.*" \
-"tbreakpoint line 1236"
-
-if {![gdb_skip_float_test "continuing to 1236"] && \
-    ![gdb_skip_stdio_test "continuing to 1236"] } {
-    gdb_test_sequence "continue" "continuing to 1236" {
-       "Continuing\\..*array_c"
-       "array_f"
-       "\[ \t\r\n\]+array_d :"
-       "\[ \t\r\n\]+========="
-       "\[ \t\r\n\]+0.000000"
-       "\[ \t\r\n\]+23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]*"
-       "\[ \t\r\n\]+.*HELLO WORLD.*main \\(\\) at .*call-ar-st.c:1236.*printf\\(.BYE BYE FOR NOW.n.\\)."
-    }
+set stop_line [gdb_get_line_number "-tbreak4-"]
+gdb_test "tbreak $stop_line" \
+"Temporary breakpoint.* file .*$srcfile, line $stop_line.*" \
+"tbreakpoint at tbreak4"
+
+if {!$skip_float_test && \
+    ![gdb_skip_stdio_test "continuing to tbreak4"] } {
+
+    gdb_test_stdio "continue" \
+       [multi_line \
+            "array_d :" \
+            "=========" \
+            "" \
+            "0.000000 *" \
+            "23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]*" \
+           ] \
+       "" \
+       "continuing to tbreak4"
 } else {
     gdb_test "continue" ".*" ""
 }
@@ -209,16 +208,35 @@ if {![gdb_skip_float_test "continuing to 1236"] && \
 #call sum_array_print(10, *list1, *list2, *list3, *list4)
 
 if ![gdb_skip_stdio_test "print sum_array_print(...)"] {
-    gdb_test "print sum_array_print(10, *list1, *list2, *list3, *list4)" \
-       ".*Sum of 4 arrays, by element \\(add in seed as well\\):\[ \t\r\n\]+Seed: 10\[ \t\r\n\]+Element Index . Sum\[ \t\r\n\]+-------------------------\[ \t\r\n\]+.*\[ \t\]+0\[ \t\]+52\[ \t\r\n\]+1\[ \t\]+60\[ \t\r\n\]+2\[ \t\]+68\[ \t\r\n\]+3\[ \t\]+76\[ \t\r\n\]+4\[ \t\]+84\[ \t\r\n\]+5\[ \t\]+92\[ \t\r\n\]+6\[ \t\]+100\[ \t\r\n\]+7\[ \t\]+108\[ \t\r\n\]+8\[ \t\]+116\[ \t\r\n\]+9\[ \t\]+124\[ \t\r\n\]+.*" \
-       "print sum_array_print(10, *list1, *list2, *list3, *list4)"
+
+    gdb_test_stdio "print sum_array_print(10, *list1, *list2, *list3, *list4)" \
+       [multi_line \
+            "Sum of 4 arrays, by element \\(add in seed as well\\): " \
+            "" \
+            "Seed: 10" \
+            "Element Index . Sum " \
+            "-------------------------" \
+            ".*" \
+            "\[ \t\]+0\[ \t\]+52" \
+            "\[ \t\]+1\[ \t\]+60" \
+            "\[ \t\]+2\[ \t\]+68" \
+            "\[ \t\]+3\[ \t\]+76" \
+            "\[ \t\]+4\[ \t\]+84" \
+            "\[ \t\]+5\[ \t\]+92" \
+            "\[ \t\]+6\[ \t\]+100" \
+            "\[ \t\]+7\[ \t\]+108" \
+            "\[ \t\]+8\[ \t\]+116" \
+            "\[ \t\]+9\[ \t\]+124" \
+           ]
 }
 
 #step over
-if ![gdb_skip_stdio_test "next to 1237"] {
-    gdb_test "next" \
-       "BYE BYE FOR NOW.*1237.*printf\\(.VERY GREEN GRASS.n.\\);.*" \
-       "next to 1237"
+set stop_line [gdb_get_line_number "-next2-"]
+if ![gdb_skip_stdio_test "next to next2"] {
+    gdb_test_stdio "next" \
+       "BYE BYE FOR NOW" \
+       "$stop_line.*printf\\(.VERY GREEN GRASS.n.\\);.*" \
+       "next to next2"
 } else {
     gdb_test "next" ".*" ""
 }
@@ -226,19 +244,18 @@ if ![gdb_skip_stdio_test "next to 1237"] {
 #call print_array_rep(\*list1, \*list2, \*list3)
 
 if ![gdb_skip_stdio_test "print print_array_rep(...)"] {
-    gdb_test "print print_array_rep(\*list1, \*list2, \*list3)" \
-       "Contents of linked list3:.*" \
-       "print print_array_rep(*list1, *list2, *list3)"
+    gdb_test_stdio "print print_array_rep(\*list1, \*list2, \*list3)" \
+       "Contents of linked list3:"
 }
 
-#go -until 1241
-gdb_test "tbreak 1241" \
-    "Temporary breakpoint..* file .*$srcfile, line 1241.*" \
-    "tbreakpoint line 1241"
+set stop_line [gdb_get_line_number "-tbreak5-"]
+gdb_test "tbreak $stop_line" \
+    "Temporary breakpoint..* file .*$srcfile, line $stop_line.*" \
+    "tbreakpoint at tbreak5"
 
 gdb_test "continue" \
-    "main \\(\\) at .*call-ar-st.c:1241\r\n1241\[\t \]+sum_array_print\\(10, \\*list1, \\*list2, \\*list3, \\*list4\\);.*" \
-    "continue to 1241"
+    "main \\(\\) at .*$srcfile:$stop_line\r\n$stop_line\[\t \]+sum_array_print\\(10, \\*list1, \\*list2, \\*list3, \\*list4\\);.*" \
+    "continue to tbreak5"
 
 
 # Run into sum_array_print, and verify that the arguments were passed
@@ -250,11 +267,11 @@ gdb_test "continue" \
 # may itself be a bug, but it's not the one we're trying to catch
 # here.  I've added something to step-test.exp for this.
 gdb_test "break sum_array_print" \
-       ".*Breakpoint ${decimal}: file .*call-ar-st.c, line.*" \
+       ".*Breakpoint ${decimal}: file .*$srcfile, line.*" \
        "set breakpoint in sum_array_print"
 gdb_test_no_output "set print frame-arguments all"
 gdb_test "continue" \
-       ".*Breakpoint ${decimal}, sum_array_print \\(seed=10, linked_list1=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .4, 6, 8, 10, 12, 14, 16, 18, 20, 22., head = 0., linked_list2=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .8, 10, 12, 14, 16, 18, 20, 22, 24, 26., head = 0., linked_list3=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .10, 12, 14, 16, 18, 20, 22, 24, 26, 28., head = 0., linked_list4=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .20, 22, 24, 26, 28, 30, 32, 34, 36, 38., head = 0.\\) at .*call-ar-st.c:1105\[ \t\n\r\]+1105.*printf\\(.Sum of 4 arrays, by element \\(add in seed as well\\).*\\);.*" \
+    ".*Breakpoint ${decimal}, sum_array_print \\(seed=10, linked_list1=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .4, 6, 8, 10, 12, 14, 16, 18, 20, 22., head = 0., linked_list2=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .8, 10, 12, 14, 16, 18, 20, 22, 24, 26., head = 0., linked_list3=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .10, 12, 14, 16, 18, 20, 22, 24, 26, 28., head = 0., linked_list4=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .20, 22, 24, 26, 28, 30, 32, 34, 36, 38., head = 0.\\) at .*$srcfile:${decimal}\[ \t\n\r\]+${decimal}.*printf\\(.Sum of 4 arrays, by element \\(add in seed as well\\).*\\);.*" \
        "check args of sum_array_print"
 
 #call print_array_rep(linked_list1, linked_list2, linked_list3)
@@ -271,15 +288,16 @@ gdb_test "continue" \
 #}
 
 
-#go -until 1281
-gdb_test "tbreak 1281" \
-    "Temporary breakpoint.* file .*call-ar-st.c, line 1281.*" \
-    "tbreakpoint line 1281"
+set stop_line [gdb_get_line_number "-tbreak6-"]
+gdb_test "tbreak $stop_line" \
+    "Temporary breakpoint.* file .*$srcfile, line $stop_line.*" \
+    "tbreakpoint at tbreak6"
 
-if ![gdb_skip_stdio_test "continuing to 1281"] {
-    gdb_test "continue" \
-       "Continuing\\..*Sum of 4 arrays.*Contents of linked list1.*Contents of two_floats_t.*main \\(\\) at .*call-ar-st.c:1281.*c = 0.*" \
-       "continue to 1281"
+if ![gdb_skip_stdio_test "continuing to tbreak6"] {
+    gdb_test_stdio "continue" \
+       "Sum of 4 arrays.*Contents of linked list1.*Contents of two_floats_t" \
+       "main \\(\\) at .*$srcfile:$stop_line.*c = 0.*" \
+       "continue to tbreak6"
 } else {
     gdb_test "continue" ".*" ""
 }
@@ -288,43 +306,59 @@ if ![gdb_skip_stdio_test "continuing to 1281"] {
 #                         *flags, *flags_combo, *three_char, *five_char, 
 #                         *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)
 
-if {![gdb_skip_float_test "print print_small_structs(...)"] && \
+if {!$skip_float_test && \
     ![gdb_skip_stdio_test "print print_small_structs(...)"] } {
-    gdb_test_sequence "print print_small_structs(*struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)" "print print_small_structs" {
-       "\[\t\r\n \]+alpha"
-       "\[\t\r\n \]+gamma"
-       "\[\t\r\n \]+epsilon"
-       "\[\t\r\n \]+alpha"
-       "\[\t\r\n \]+gamma"
-       "\[\t\r\n \]+epsilon"
-       "\[\t\r\n \]+ch1: y[ \t]*ch2: n"
-       "\[\t\r\n \]+Contents of three_char_t:"
-       "\[\t\r\n \]+a[ \t]*b[ \t]*c"
-       "\[\t\r\n \]+Contents of five_char_t:"
-       "\[\t\r\n \]+l[ \t]*m[ \t]*n[ \t]*o[ \t]*p"
-       "\[\t\r\n \]+Contents of int_char_combo_t:"
-       "\[\t\r\n \]+123[ \t]*z"
-       "\[\t\r\n \]+Sum of the 4 struct values and seed :"
-       "\[\t\r\n \]+52"
-       "\[\t\r\n \]+Contents of struct1:"
-       "\[\t\r\n \]+6[ \t]*0"
-       "\[\t\r\n \]+Contents of struct2:"
-       "\[\t\r\n \]+10[ \t]*0"
-       "\[\t\r\n \]+Contents of struct3:"
-       "\[\t\r\n \]+12[ \t]*0"
-       "\[\t\r\n \]+Contents of one_double_t:"
-       "\[\t\r\n \]+10.500000"
-       "\[\t\r\n \]+Contents of one_double_t:"
-       "\[\t\r\n \]+-3.375000"
-       "\[\t\r\n \]+Contents of one_double_t:"
-       "\[\t\r\n \]+675.093750"
-       "\[\t\r\n \]+Contents of two_floats_t:"
-       "\[\t\r\n \]+45.234001[ \t]*43.599998"
-       "\[\t\r\n \]+Contents of two_floats_t:"
-       "\[\t\r\n \]+78.010002[ \t]*122.099998"
-       "\[\t\r\n \]+Contents of two_floats_t:"
-       "\[\t\r\n \]+-1232.344971[ \t]*-199.210007"
-    }
+    gdb_test_stdio "print print_small_structs(*struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)" \
+       [multi_line \
+            "alpha" \
+            "gamma" \
+            "epsilon" \
+            "alpha" \
+            "gamma" \
+            "epsilon" \
+            "ch1: y\[ \t\]*ch2: n" \
+            "Contents of three_char_t: " \
+            "" \
+            "a\[ \t\]*b\[ \t\]*c" \
+            "Contents of five_char_t: " \
+            "" \
+            "l\[ \t\]*m\[ \t\]*n\[ \t\]*o\[ \t\]*p" \
+            "Contents of int_char_combo_t: " \
+            "" \
+            "123\[ \t\]*z" \
+            "Sum of the 4 struct values and seed : " \
+            "" \
+            "\[ \t\]*52" \
+            "Contents of struct1: " \
+            "" \
+            "\[ \t\]*6\[ \t\]*0" \
+            "Contents of struct2: " \
+            "" \
+            "\[ \t\]*10\[ \t\]*0" \
+            "Contents of struct3: " \
+            "" \
+            "\[ \t\]*12\[ \t\]*0" \
+            "Contents of one_double_t: " \
+            "" \
+            "10.500000" \
+            "Contents of one_double_t: " \
+            "" \
+            "-3.375000" \
+            "Contents of one_double_t: " \
+            "" \
+            "675.093750" \
+            "Contents of two_floats_t: " \
+            "" \
+            "\[ \t\]*45.234001\[ \t\]*43.599998" \
+            "Contents of two_floats_t: " \
+            "" \
+            "\[ \t\]*78.010002\[ \t\]*122.099998" \
+            "Contents of two_floats_t: " \
+            "" \
+            "-1232.344971\[ \t\]*-199.210007" \
+           ] \
+       "" \
+       "print print_small_structs"
 }
 
 #call compute_with_small_structs(20)
@@ -336,64 +370,48 @@ gdb_test "print compute_with_small_structs(20)" \
 #call print_ten_doubles(123.456, 123.456, -0.12, -1.23, 343434.8, 89.098, 
 #                       3.14, -5678.12345, -0.11111111, 216.97065)
 
-if {![gdb_skip_float_test "print print_ten_doubles(...)"] && \
+if {!$skip_float_test && \
     ![gdb_skip_stdio_test "print print_ten_doubles(...)"]} {
-    gdb_test_sequence "print print_ten_doubles(123.456, 123.456, -0.12, -1.23, 343434.8, 89.098, 3.14, -5678.12345, -0.11111111, 216.97065)" "print print_ten_doubles" {
-       "\[\t\r\n \]+Two Doubles : 123.45\[0-9\]*.*123.45\[0-9\]*"
-       "\[\t\r\n \]+Two Doubles : -0.1200\[0-9\]*.*-1.2300\[0-9\]*"
-       "\[\t\r\n \]+Two Doubles : 343434.\[0-9\]*.*89.09\[0-9\]*"
-       "\[\t\r\n \]+Two Doubles : 3.1400\[0-9\]*.*-5678.123\[0-9\]*"
-       "\[\t\r\n \]+Two Doubles : -0.1111\[0-9\]*.*216.97\[0-9\]*"
-    }
+    gdb_test_stdio "print print_ten_doubles(123.456, 123.456, -0.12, -1.23, 343434.8, 89.098, 3.14, -5678.12345, -0.11111111, 216.97065)" \
+       [multi_line \
+            "Two Doubles : 123.45\[0-9\]*.*123.45\[0-9\]*" \
+            "Two Doubles : -0.1200\[0-9\]*.*-1.2300\[0-9\]*" \
+            "Two Doubles : 343434.\[0-9\]*.*89.09\[0-9\]*" \
+            "Two Doubles : 3.1400\[0-9\]*.*-5678.123\[0-9\]*" \
+            "Two Doubles : -0.1111\[0-9\]*.*216.97\[0-9\]*" \
+            ]
 }
 
-#go -until 1286
-gdb_test "tbreak 1286" \
-    "Temporary breakpoint .* file .*call-ar-st.c, line 1286.*" \
-    "tbreakpoint line 1286"
-
-gdb_test continue "Continuing\\..*main \\(.*\\) at.*call-ar-st.c:1286\[\t\r\n \]+1286.*print_long_arg_list \\( a, b, c, d, e, f, .struct1, .struct2, .struct3, .struct4,.*" "continue to 1286"
-
-if { [istarget "hppa*-*-hpux*"] } {
-    #
-    # NOTE:(FIXME)
-    # the aCC demangler cannot demangle the name of a function with >10 args.
-    # so I added a .* after the name of the function, to match the
-    # incredibly long mangled name 
-    # (getting aCC's libdemangle.a bundled w/ the system?)
-    # DTS CLLbs16994  coulter 990114
-    # 
-    # FIXME: use step for hppa* testing for now
-    # guo 990621
-    #
-    gdb_test "step" \
-       "print_long_arg_list.*\\(a=22.25, b=33.375, c=0, d=-25, e=100, f=2345, struct1=\{value = 6, head = 0\}, struct2=\{value = 10, head = 0\}, struct3=\{value = 12, head = 0\}, struct4=\{value = 14, head = 0\}, flags=\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\}, flags_combo=\{alpha = 1, beta = 0, ch1 = 121 \'y\', gamma = 1, delta = 0, ch2 = 110 \'n\', epsilon = 1, omega = 0\}, three_char=\{ch1 = 97 \'a\', ch2 = 98 \'b\', ch3 = 99 \'c\'\}, five_char=\{ch1 = 108 \'l\', ch2 = 109 \'m\', ch3 = 110 \'n\', ch4 = 111 \'o\', ch5 = 112 \'p\'\}, int_char_combo=\{int1 = 123, ch1 = 122 \'z\'\}, d1=\{double1 = 10.5\}, d2=\{double1 = -3.375\}, d3=\{double1 = 675.09375\}, f1=\{float1 = 45.2340012, float2 = 43.5999985\}, f2=\{float1 = 78.0100021, float2 = 122.099998\}, f3=\{float1 = -1232.34497, float2 = -199.210007\}\\) at .*${srcfile}:992\[\r\n\]+992\[ \t\]+printf\\(\"double :.*\", a\\);" \
-       "step into print_long_arg_list"
-} else {
-
-    # We can't just assume that a "step" will get us into
-    # print_long_arg_list here,either.
-    gdb_test "tbreak print_long_arg_list" \
-       "Temporary breakpoint .* file .*call-ar-st.c, line .*" \
-       "tbreak in print_long_arg_list after stepping into memcpy"
-    # The short match case below handles cases where a buffer
-    # overflows or something, and expect can't deal with the full
-    # line.  Perhaps a more elegant solution exists... -sts 1999-08-17
-    if {![gdb_skip_float_test "step into print_long_arg_list"]} {
-       gdb_test_multiple "continue" "step into print_long_arg_list" {
-           -re ".*print_long_arg_list \\(a=22.25, b=33.375, c=0, d=-25, e=100, f=2345, struct1=\{value = 6, head = 0\}, struct2=\{value = 10, head = 0\}, struct3=\{value = 12, head = 0\}, struct4=\{value = 14, head = 0\}, flags=\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\}, flags_combo=\{alpha = 1, beta = 0, ch1 = 121 \'y\', gamma = 1, delta = 0, ch2 = 110 \'n\', epsilon = 1, omega = 0\}, three_char=\{ch1 = 97 \'a\', ch2 = 98 \'b\', ch3 = 99 \'c\'\}, five_char=\{ch1 = 108 \'l\', ch2 = 109 \'m\', ch3 = 110 \'n\', ch4 = 111 \'o\', ch5 = 112 \'p\'\}, int_char_combo=\{int1 = 123, ch1 = 122 \'z\'\}, d1=\{double1 = 10.5\}, d2=\{double1 = -3.375\}, d3=\{double1 = 675.09375\}, f1=\{float1 = 45.2340012, float2 = 43.5999985\}, f2=\{float1 = 78.0100021, float2 = 122.099998\}, f3=\{float1 = -1232.34497, float2 = -199.210007\}\\) at .*${srcfile}:992\[\r\n\]+992\[ \t\]+printf\\(\"double :.*\", a\\);.*$gdb_prompt $" {
-               pass "step into print_long_arg_list"
-           }
-           -re ".*print_long_arg_list.*\\(a=22.25, b=33.375, c=0, d=-25, e=100, f=2345, struct1=\{value = 6, head = 0\}, struct2=\{value = 10, head = 0\}, struct3=\{value = 12, head = 0\}, struct4=\{value = 14, head = 0\}, flags=\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\}, flags_combo=\{alpha = 1, beta = 0, ch1 = 121 \'y\', gamma = 1, delta = 0, ch2 = 110 \'n\', epsilon = 1, omega = 0\}, three_char=\{ch1 = 97 \'a\', ch2 = 98 \'b\', ch3 = 99 \'c\'\}.*\\) at .*${srcfile}:992\[\r\n\]+992\[ \t\]+printf\\(\"double :.*\", a\\);.*$gdb_prompt $" {
-               pass "step into print_long_arg_list (short match)"
-           }
+set stop_line [gdb_get_line_number "-tbreak7-"]
+gdb_test "tbreak $stop_line" \
+    "Temporary breakpoint .* file .*$srcfile, line $stop_line.*" \
+    "tbreakpoint at tbreak7"
+
+gdb_test continue "Continuing\\..*main \\(.*\\) at.*$srcfile:$stop_line\[\t\r\n \]+$stop_line.*print_long_arg_list \\( a, b, c, d, e, f, .struct1, .struct2, .struct3, .struct4,.*" "continue to tbreak7"
+
+set stop_line [gdb_get_line_number "-step2-"]
+# We can't just assume that a "step" will get us into
+# print_long_arg_list here,either.
+gdb_test "tbreak print_long_arg_list" \
+    "Temporary breakpoint .* file .*$srcfile, line .*" \
+    "tbreak in print_long_arg_list after stepping into memcpy"
+# The short match case below handles cases where a buffer
+# overflows or something, and expect can't deal with the full
+# line.  Perhaps a more elegant solution exists... -sts 1999-08-17
+if {!$skip_float_test} {
+    gdb_test_multiple "continue" "step into print_long_arg_list" {
+       -re ".*print_long_arg_list \\(a=22.25, b=33.375, c=0, d=-25, e=100, f=2345, struct1=\{value = 6, head = 0\}, struct2=\{value = 10, head = 0\}, struct3=\{value = 12, head = 0\}, struct4=\{value = 14, head = 0\}, flags=\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\}, flags_combo=\{alpha = 1, beta = 0, ch1 = 121 \'y\', gamma = 1, delta = 0, ch2 = 110 \'n\', epsilon = 1, omega = 0\}, three_char=\{ch1 = 97 \'a\', ch2 = 98 \'b\', ch3 = 99 \'c\'\}, five_char=\{ch1 = 108 \'l\', ch2 = 109 \'m\', ch3 = 110 \'n\', ch4 = 111 \'o\', ch5 = 112 \'p\'\}, int_char_combo=\{int1 = 123, ch1 = 122 \'z\'\}, d1=\{double1 = 10.5\}, d2=\{double1 = -3.375\}, d3=\{double1 = 675.09375\}, f1=\{float1 = 45.2340012, float2 = 43.5999985\}, f2=\{float1 = 78.0100021, float2 = 122.099998\}, f3=\{float1 = -1232.34497, float2 = -199.210007\}\\) at .*${srcfile}:$stop_line\[\r\n\]+$stop_line\[ \t\]+printf\\(\"double :.*\", a\\);.*$gdb_prompt $" {
+           pass "step into print_long_arg_list"
+       }
+       -re ".*print_long_arg_list.*\\(a=22.25, b=33.375, c=0, d=-25, e=100, f=2345, struct1=\{value = 6, head = 0\}, struct2=\{value = 10, head = 0\}, struct3=\{value = 12, head = 0\}, struct4=\{value = 14, head = 0\}, flags=\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\}, flags_combo=\{alpha = 1, beta = 0, ch1 = 121 \'y\', gamma = 1, delta = 0, ch2 = 110 \'n\', epsilon = 1, omega = 0\}, three_char=\{ch1 = 97 \'a\', ch2 = 98 \'b\', ch3 = 99 \'c\'\}.*\\) at .*${srcfile}:$stop_line\[\r\n\]+$stop_line\[ \t\]+printf\\(\"double :.*\", a\\);.*$gdb_prompt $" {
+           pass "step into print_long_arg_list (short match)"
        }
-    } else {
-       # If skipping float tests, don't expect anything in arg list.
-       gdb_test "continue" \
-           "print_long_arg_list \\(.*\\).*" \
-           "step into print_long_arg_list"
     }
+} else {
+    # If skipping float tests, don't expect anything in arg list.
+    gdb_test "continue" \
+       "print_long_arg_list \\(.*\\).*" \
+       "step into print_long_arg_list"
 }
 
 set ws "\[\n\r\t \]+"
@@ -402,7 +420,7 @@ set ws "\[\n\r\t \]+"
 #                         flags_combo, three_char, five_char, int_char_combo, 
 #                         d1, d2, d3, f1, f2, f3)
 
-if {![gdb_skip_float_test "print_small_structs from print_long_arg_list"] && \
+if {!$skip_float_test && \
     ![gdb_skip_stdio_test "print_small_structs from print_long_arg_list"] } {
 
     # On 32-bit SPARC, some of the args are passed by ref, others by
@@ -412,162 +430,195 @@ if {![gdb_skip_float_test "print_small_structs from print_long_arg_list"] && \
        setup_kfail "gdb/1539" "sparc-*-*"
     }
 
-    gdb_test_sequence "print print_small_structs(struct1, struct2, struct3, struct4, flags, flags_combo, three_char, five_char, int_char_combo, d1, d2, d3, f1, f2, f3)" "print print_small_structs from print_long_arg_list" {
-       "\[\t\r\n \]+alpha"
-       "\[\t\r\n \]+gamma"
-       "\[\t\r\n \]+epsilon"
-       "\[\t\r\n \]+alpha"
-       "\[\t\r\n \]+gamma"
-       "\[\t\r\n \]+epsilon"
-       "\[\t\r\n \]+ch1: y[ \t]*ch2: n"
-       "\[\t\r\n \]+Contents of three_char_t:"
-       "\[\t\r\n \]+a\[ \t\]*b\[ \t\]*c"
-       "\[\t\r\n \]+Contents of five_char_t:"
-       "\[\t\r\n \]+l\[ \t\]*m\[ \t\]*n\[ \t\]*o\[ \t\]*p"
-       "\[\t\r\n \]+Contents of int_char_combo_t:"
-       "\[\t\r\n \]+123\[ \t\]*z"
-       "\[\t\r\n \]+Sum of the 4 struct values and seed :"
-       "\[\t\r\n \]+52"
-       "\[\t\r\n \]+Contents of struct1:"
-       "\[\t\r\n \]+6\[ \t\]*0"
-       "\[\t\r\n \]+Contents of struct2:"
-       "\[\t\r\n \]+10\[ \t\]*0"
-       "\[\t\r\n \]+Contents of struct3:"
-       "\[\t\r\n \]+12\[ \t\]*0"
-       "\[\t\r\n \]+Contents of one_double_t:"
-       "\[\t\r\n \]+10.500000"
-       "\[\t\r\n \]+Contents of one_double_t:"
-       "\[\t\r\n \]+-3.375000"
-       "\[\t\r\n \]+Contents of one_double_t:"
-       "\[\t\r\n \]+675.093750"
-       "\[\t\r\n \]+Contents of two_floats_t:"
-       "\[\t\r\n \]+45.234001\[ \t\]*43.599998"
-       "\[\t\r\n \]+Contents of two_floats_t:"
-       "\[\t\r\n \]+78.010002\[ \t\]*122.099998"
-       "\[\t\r\n \]+Contents of two_floats_t:"
-       "\[\t\r\n \]+-1232.344971\[ \t\]*-199.210007"
-    }
-}
 
+    gdb_test_stdio "print print_small_structs(struct1, struct2, struct3, struct4, flags, flags_combo, three_char, five_char, int_char_combo, d1, d2, d3, f1, f2, f3)" \
+       [multi_line \
+            "alpha" \
+            "gamma" \
+            "epsilon" \
+            "alpha" \
+            "gamma" \
+            "epsilon" \
+            "ch1: y\[ \t\]*ch2: n" \
+            "Contents of three_char_t: " \
+            "" \
+            "a\[ \t\]*b\[ \t\]*c" \
+            "Contents of five_char_t: " \
+            "" \
+            "l\[ \t\]*m\[ \t\]*n\[ \t\]*o\[ \t\]*p" \
+            "Contents of int_char_combo_t: " \
+            "" \
+            "123\[ \t\]*z" \
+            "Sum of the 4 struct values and seed : " \
+            "" \
+            "\[ \t\]*52" \
+            "Contents of struct1: " \
+            "" \
+            "\[ \t\]*6\[ \t\]*0" \
+            "Contents of struct2: " \
+            "" \
+            "\[ \t\]*10\[ \t\]*0" \
+            "Contents of struct3: " \
+            "" \
+            "\[ \t\]*12\[ \t\]*0" \
+            "Contents of one_double_t: " \
+            "" \
+            "10.500000" \
+            "Contents of one_double_t: " \
+            "" \
+            "-3.375000" \
+            "Contents of one_double_t: " \
+            "" \
+            "675.093750" \
+            "Contents of two_floats_t: " \
+            "" \
+            "\[ \t\]*45.234001\[ \t\]*43.599998" \
+            "Contents of two_floats_t: " \
+            "" \
+            "\[ \t\]*78.010002\[ \t\]*122.099998" \
+            "Contents of two_floats_t: " \
+            "" \
+            "-1232.344971\[ \t\]*-199.210007" \
+           ] \
+       "" \
+       "print print_small_structs from print_long_arg_list"
+}
 
-#go -until 1300
-gdb_test "tbreak 1300" \
-    "Temporary breakpoint.* file .*call-ar-st.c, line 1300.*" \
-    "tbreakpoint line 1300"
+set stop_line [gdb_get_line_number "-tbreak8-"]
+gdb_test "tbreak $stop_line" \
+    "Temporary breakpoint.* file .*$srcfile, line $stop_line.*" \
+    "tbreakpoint at tbreak8"
 
-if ![gdb_skip_stdio_test "continuing to 1300"] {
-    gdb_test "continue" "Continuing\\..*Contents of two_floats_t:.*main \\(\\) at.*call-ar-st.c:1300.*1300.*init_bit_flags_combo\\(flags_combo, \\(unsigned\\)1, \\(unsigned\\)0, .y.,.*" \
-           "continue to 1300"
+if ![gdb_skip_stdio_test "continuing to tbreak8"] {
+    gdb_test_stdio "continue" \
+       "Contents of two_floats_t:" \
+       ".*main \\(\\) at.*$srcfile:$stop_line.*$stop_line.*init_bit_flags_combo\\(flags_combo, \\(unsigned\\)1, \\(unsigned\\)0, .y.,.*" \
+       "continue to tbreak8"
 } else {
     gdb_test "continue" ".*" ""
 }
 
 #step
+set stop_line [gdb_get_line_number "-step3-"]
 gdb_test "step" \
-    "init_bit_flags_combo \\(bit_flags_combo=, a=1, b=0, ch1=121 .y., g=1, d=0, ch2=110 .n., e=1, o=0\\) at .*call-ar-st.c:416\[ \t\n\r\]+416.*bit_flags_combo->alpha = a;" \
+    "init_bit_flags_combo \\(bit_flags_combo=, a=1, b=0, ch1=121 .y., g=1, d=0, ch2=110 .n., e=1, o=0\\) at .*$srcfile:$stop_line\[ \t\n\r\]+$stop_line.*bit_flags_combo->alpha = a;.*" \
     "step into init_bit_flags_combo"
 
 #call print_bit_flags_combo(*bit_flags_combo)
-if ![gdb_skip_stdio_test "continuing to 1300"] {
-    gdb_test "print print_bit_flags_combo(*bit_flags_combo)" \
-       "alpha.*gamma.*epsilon.*ch1: y.*ch2: n.*" \
-       "print print_bit_flags_combo from init_bit_flags_combo"
+if ![gdb_skip_stdio_test "continuing at step3"] {
+    gdb_test_stdio "print print_bit_flags_combo(*bit_flags_combo)" \
+       "alpha.*gamma.*epsilon.*ch1: y.*ch2: n"
 }
 
 
-#go -until 1305
-gdb_test "tbreak 1305" \
-    "Temporary breakpoint.* file .*call-ar-st.c, line 1305.*" \
-    "tbreakpoint line 1305"
+set stop_line [gdb_get_line_number "-tbreak9-"]
+gdb_test "tbreak $stop_line" \
+    "Temporary breakpoint.* file .*$srcfile, line $stop_line.*" \
+    "tbreakpoint at tbreak9"
 
-gdb_test continue "Continuing\\..*main \\(\\) at .*call-ar-st.c:1305\[\r\n\t \]+1305.*init_int_char_combo\\(int_char_combo, 13, .!.\\);" \
-"continue to 1305"
+gdb_test continue "Continuing\\..*main \\(\\) at .*$srcfile:$stop_line\[\r\n\t \]+$stop_line.*init_int_char_combo\\(int_char_combo, 13, .!.\\);.*" \
+"continue to tbreak9"
 
 #call print_long_arg_list(a, b, c, d, e, f, *struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)
 
-# FIXME:
-# HP aCC demangler currently does not handle hp aCC functions with >10 args
-# DTS CLLbs16994  coulter 990114
-
-if {$hp_aCC_compiler} {setup_xfail "hppa*-*-*" CLLbs16994}
-
-if {![gdb_skip_float_test "print print_long_arg_list"] && \
+if {!$skip_float_test && \
     ![gdb_skip_stdio_test "print print_long_arg_list"] } {
-    gdb_test_sequence "print print_long_arg_list(a, b, c, d, e, f, *struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)" "print print_long_arg_list" {
-       "\[ \n\r\t\]+double : 22.250000"
-       "\[ \n\r\t\]+double : 33.375000"
-       "\[ \n\r\t\]+int : 0"
-       "\[ \n\r\t\]+int : -25"
-       "\[ \n\r\t\]+int : 100"
-       "\[ \n\r\t\]+int : 2345"
-       "\[ \n\r\t\]+alpha"
-       "\[ \n\r\t\]+gamma"
-       "\[ \n\r\t\]+epsilon"
-       "\[ \n\r\t\]+ch1: y\[ \t\]+ch2: n"
-       "\[ \n\r\t\]+Contents of three_char_t:"
-       "\[ \n\r\t\]+x\[ \t\]+y\[ \t\]+z"
-       "\[ \n\r\t\]+Contents of five_char_t:"
-       "\[ \n\r\t\]+h\[ \t\]+e\[ \t\]+l\[ \t\]+l\[ \t\]+o"
-       "\[ \n\r\t\]+Contents of int_char_combo_t:"
-       "\[ \n\r\t\]+123\[ \t\]+z"
-       "\[ \n\r\t\]+Sum of the 4 struct values and seed :"
-       "\[ \n\r\t\]+52"
-       "\[ \n\r\t\]+Contents of struct1:"
-       "\[ \n\r\t\]+6\[ \t\]+0"
-       "\[ \n\r\t\]+Contents of struct2:"
-       "\[ \n\r\t\]+10\[ \t\]+0"
-       "\[ \n\r\t\]+Contents of struct3:"
-       "\[ \n\r\t\]+12\[ \t\]+0"
-       "\[ \n\r\t\]+Contents of one_double_t:"
-       "\[ \n\r\t\]+1.111110"
-       "\[ \n\r\t\]+Contents of one_double_t:"
-       "\[ \n\r\t\]+-345.340000"
-       "\[ \n\r\t\]+Contents of one_double_t:"
-       "\[ \n\r\t\]+546464.200000"
-       "\[ \n\r\t\]+Contents of two_floats_t:"
-       "\[ \n\r\t\]+0.234000\[ \t\]+453.100006"
-       "\[ \n\r\t\]+Contents of two_floats_t:"
-       "\[ \n\r\t\]+78.345001\[ \t\]+23.090000"
-       "\[ \n\r\t\]+Contents of two_floats_t:"
-       "\[ \n\r\t\]+-2.345000\[ \t\]+1.000000"
-    }
+
+    gdb_test_stdio "print print_long_arg_list(a, b, c, d, e, f, *struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)" \
+       [multi_line \
+            "double : 22.250000" \
+            "double : 33.375000" \
+            "int : 0" \
+            "int : -25" \
+            "int : 100" \
+            "int : 2345" \
+            "alpha" \
+            "gamma" \
+            "epsilon" \
+            "alpha" \
+            "gamma" \
+            "epsilon" \
+            "ch1: y\[ \t\]*ch2: n" \
+            "Contents of three_char_t: " \
+            "" \
+            "x\[ \t\]*y\[ \t\]*z" \
+            "Contents of five_char_t: " \
+            "" \
+            "h\[ \t\]*e\[ \t\]*l\[ \t\]*l\[ \t\]*o" \
+            "Contents of int_char_combo_t: " \
+            "" \
+            "123\[ \t\]*z" \
+            "Sum of the 4 struct values and seed : " \
+            "" \
+            "\[ \t\]*52" \
+            "Contents of struct1: " \
+            "" \
+            "\[ \t\]*6\[ \t\]*0" \
+            "Contents of struct2: " \
+            "" \
+            "\[ \t\]*10\[ \t\]*0" \
+            "Contents of struct3: " \
+            "" \
+            "\[ \t\]*12\[ \t\]*0" \
+            "Contents of one_double_t: " \
+            "" \
+            "1.111110" \
+            "Contents of one_double_t: " \
+            "" \
+            "-345.340000" \
+            "Contents of one_double_t: " \
+            "" \
+            "546464.200000" \
+            "Contents of two_floats_t: " \
+            "" \
+            "0.234000\[ \t\]*453.100006" \
+            "Contents of two_floats_t: " \
+            "" \
+            "78.345001\[ \t\]*23.090000" \
+            "Contents of two_floats_t: " \
+            "" \
+            "-2.345000\[ \t\]*1.000000" \
+           ] \
+       "" \
+       "print print_long_arg_list"
 }
 
 
-#go -until 1311
-gdb_test "tbreak 1311" \
-    "Temporary breakpoint.* file .*call-ar-st.c, line 1311.*" \
-    "tbreakpoint line 1311"
+set stop_line [gdb_get_line_number "-tbreak10-"]
+gdb_test "tbreak $stop_line" \
+    "Temporary breakpoint.* file .*$srcfile, line $stop_line.*" \
+    "tbreakpoint at tbreak10"
 
-gdb_test continue "Continuing\\..*main \\(\\) at .*call-ar-st.c:1311\[ \t\n\r\]+1311.*compute_with_small_structs\\(35\\);" \
-"continue to 1311"
+gdb_test continue "Continuing\\..*main \\(\\) at .*$srcfile:$stop_line\[ \t\n\r\]+$stop_line.*compute_with_small_structs\\(35\\);.*" \
+"continue to tbreak10"
 
 
 #call sum_struct_print(10, *struct1, *struct2, *struct3, *struct4)
 if ![gdb_skip_stdio_test "print sum_struct_print(...)"] {
-    gdb_test "print sum_struct_print(10,*struct1,*struct2,*struct3,*struct4)" \
-       "Sum of the 4 struct values and seed :\[ \t\n\r\]+218.*" \
-       "print sum_struct_print(10, *struct1, *struct2, *struct3, *struct4)"
+    gdb_test_stdio "print sum_struct_print(10,*struct1,*struct2,*struct3,*struct4)" \
+       "Sum of the 4 struct values and seed :\[ \t\n\r\]+218"
 }
 
 
 #call print_struct_rep(*struct1, *struct2, *struct3)
 if ![gdb_skip_stdio_test "print print_struct_rep(...)"] {
-    gdb_test_sequence "print print_struct_rep(*struct1, *struct2, *struct3)" \
-       "print print_struct_rep(*struct1, *struct2, *struct3)" {
-       "\[ \t\n\r\]+Contents of struct1:"
-       "\[ \t\n\r\]+        22         0"
-       "\[ \t\n\r\]+Contents of struct2:"
-       "\[ \t\n\r\]+        42         0"
-       "\[ \t\n\r\]+Contents of struct3:"
-       "\[ \t\n\r\]+        62         0"
-    }
+    gdb_test_stdio "print print_struct_rep(*struct1, *struct2, *struct3)" \
+       [multi_line \
+            "Contents of struct1: " \
+            "" \
+            "        22         0" \
+            "Contents of struct2: " \
+            "" \
+            "        42         0" \
+            "Contents of struct3: " \
+            "" \
+            "        62         0" \
+           ]
 }
 
 if ![gdb_skip_stdio_test "print print_one_large_struct(...)"] {
-    gdb_test "print print_one_large_struct(*list1)" \
-       "         4         1.*" \
-       "print print_one_large_struct(*list1)"
+    gdb_test_stdio "print print_one_large_struct(*list1)" \
+       "         4         1"
 }
 
 set timeout $oldtimeout
This page took 0.036188 seconds and 4 git commands to generate.