import gdb-2000-02-04 snapshot

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.c++ / ovldbreak.exp

diff --git a/gdb/testsuite/gdb.c++/ovldbreak.exp b/gdb/testsuite/gdb.c++/ovldbreak.exp
index d7482bddfba0f0f3f2aa56a36eed41c80c0d3db6..2513b5fcb738c87d1b814f211c2c00591929a4c4 100644 (file)
--- a/gdb/testsuite/gdb.c++/ovldbreak.exp
+++ b/gdb/testsuite/gdb.c++/ovldbreak.exp
@@ -554,122 +554,30 @@ gdb_test "info break" \
     "breakpoint info"
 
 
+proc continue_to_bp_overloaded {n formals actuals} {
+    global gdb_prompt hex decimal srcfile 
     send_gdb "cont\n"
     gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 25, foo::overload1arg \\(this=$hex\\) at.*$srcfile:110\r\n110\[\t \]+int foo::overload1arg \\(void\\)\[\t \]+\{  return 1; \}\r\n$gdb_prompt $" {
-            pass "continue to bp overloaded : void"
+        -re "Continuing.\r\n\r\nBreakpoint $n, (${hex} in )?foo::overload1arg \\(this=${hex}(, )?${actuals}\\) at.*$srcfile:${decimal}\r\n${decimal}\[\t \]+int foo::overload1arg \\(${formals}\\).*\r\n$gdb_prompt $" {
+            pass "continue to bp overloaded : ${formals}"
         }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : void"  }
-        timeout { fail "(timeout) continue to bp overloaded : void"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 24, foo::overload1arg \\(this=$hex, arg=2 \\'\\\\002\\'\\) at.*$srcfile:111\r\n111\[\t \]+int foo::overload1arg \\(char arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : char"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : char"  }
-        timeout { fail "(timeout) continue to bp overloaded : char"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 23, foo::overload1arg \\(this=$hex, arg=3 \\'\\\\003\\'\\) at.*$srcfile:112\r\n112\[\t \]+int foo::overload1arg \\(signed char arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : signed char"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : signed char"  }
-        timeout { fail "(timeout) continue to bp overloaded : signed char"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 22, foo::overload1arg \\(this=$hex, arg=4 \\'\\\\004\\'\\) at.*$srcfile:113\r\n113\[\t \]+int foo::overload1arg \\(unsigned char arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : unsigned char"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : unsigned char"  }
-        timeout { fail "(timeout) continue to bp overloaded : unsigned char"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 21, foo::overload1arg \\(this=$hex, arg=5\\) at.*$srcfile:114\r\n114\[\t \]+int foo::overload1arg \\(short arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : short"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : short"  }
-        timeout { fail "(timeout) continue to bp overloaded : short"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 20, foo::overload1arg \\(this=$hex, arg=6\\) at.*$srcfile:115\r\n115\[\t \]+int foo::overload1arg \\(unsigned short arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : unsigned short"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : unsigned short"  }
-        timeout { fail "(timeout) continue to bp overloaded : unsigned short"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 19, foo::overload1arg \\(this=$hex, arg=7\\) at.*$srcfile:116\r\n116\[\t \]+int foo::overload1arg \\(int arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : int"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : int"  }
-        timeout { fail "(timeout) continue to bp overloaded : int"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 18, foo::overload1arg \\(this=$hex, arg=8\\) at.*$srcfile:117\r\n117\[\t \]+int foo::overload1arg \\(unsigned int arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : unsigned int"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : unsigned int"  }
-        timeout { fail "(timeout) continue to bp overloaded : unsigned int"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 17, foo::overload1arg \\(this=$hex, arg=9\\) at.*$srcfile:118\r\n118\[\t \]+int foo::overload1arg \\(long arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : long"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : long"  }
-        timeout { fail "(timeout) continue to bp overloaded : long"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 16, foo::overload1arg \\(this=$hex, arg=10\\) at.*$srcfile:119\r\n119\[\t \]+int foo::overload1arg \\(unsigned long arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : unsigned long"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : unsigned long"  }
-        timeout { fail "(timeout) continue to bp overloaded : unsigned long"  }
-    }
-
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 15, foo::overload1arg \\(this=$hex, arg=100\\) at.*$srcfile:120\r\n120\[\t \]+int foo::overload1arg \\(float arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : float"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : float"  }
-        timeout { fail "(timeout) continue to bp overloaded : float"  }
-    }
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nBreakpoint 14, foo::overload1arg \\(this=$hex, arg=200\\) at.*$srcfile:121\r\n121\[\t \]+int foo::overload1arg \\(double arg\\).*$gdb_prompt $" {
-            pass "continue to bp overloaded : double"
-        }
-        -re "$gdb_prompt $" { fail "continue to bp overloaded : double"  }
-        timeout { fail "(timeout) continue to bp overloaded : double"  }
+        -re "$gdb_prompt $" { fail "continue to bp overloaded : ${formals}"  }
+        timeout { fail "(timeout) continue to bp overloaded : ${formals}"  }
     }
+}
 
-    gdb_continue_to_end "finish program"
+continue_to_bp_overloaded 25 "void" ""
+continue_to_bp_overloaded 24 "char arg" "arg=2 \\'\\\\002\\'"
+continue_to_bp_overloaded 23 "signed char arg" "arg=3 \\'\\\\003\\'"
+continue_to_bp_overloaded 22 "unsigned char arg" "arg=4 \\'\\\\004\\'"
+continue_to_bp_overloaded 21 "short arg" "arg=5"
+continue_to_bp_overloaded 20 "unsigned short arg" "arg=6"
+continue_to_bp_overloaded 19 "int arg" "arg=7"
+continue_to_bp_overloaded 18 "unsigned int arg" "arg=8"
+continue_to_bp_overloaded 17 "long arg" "arg=9"
+continue_to_bp_overloaded 16 "unsigned long arg" "arg=10"
+continue_to_bp_overloaded 15 "float arg" "arg=100"
+continue_to_bp_overloaded 14 "double arg" "arg=200"
+
+
+gdb_continue_to_end "finish program"