2000-12-05 Michael Snyder <msnyder@mvstp600e.cygnus.com>

        * gdb.base/constvars.exp: Add a "pass" message if "up" succeeds.
        * gdb.base/miscexprs.exp: Ditto.
        * gdb.base/pointers.exp:  Ditto.
        * gdb.c++/derivation.exp: Ditto.
        * gdb.c++/local.exp:      Ditto.
        * gdb.c++/namespace.exp:  Ditto.
        * gdb.c++/overload.exp:   Ditto.
        * gdb.c++/ref-types.exp:  Ditto.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c90bdc15eac1e40c1bd38b36a9b89bc4f2d88d06..aabec46c9508945ab5f6b4466a0e305f2179ee29 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2000-12-05  Michael Snyder  <msnyder@mvstp600e.cygnus.com>
+
+       * gdb.base/constvars.exp: Add a "pass" message if "up" succeeds.
+       * gdb.base/miscexprs.exp: Ditto.
+       * gdb.base/pointers.exp:  Ditto.
+       * gdb.c++/derivation.exp: Ditto.
+       * gdb.c++/local.exp:      Ditto.
+       * gdb.c++/namespace.exp:  Ditto.
+       * gdb.c++/overload.exp:   Ditto.
+       * gdb.c++/ref-types.exp:  Ditto.
+
 2000-12-05  Michael Snyder  <msnyder@mvstp600e.cygnus.com>
 
        * gdb.base/constvars.exp: Test result of "up" command.

diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index 1cdc231c90e213257236b5e26bf9c0c37af0ea7b..f9d1b24dea5468dbcc61b0f8e77bf60e1be89f21 100644 (file)
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -79,7 +79,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-               -re ".*main.*$gdb_prompt $" {}
+               -re ".*main.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
                 -re ".*$gdb_prompt $" {
                    fail "up from marker1"
                }
@@ -90,7 +92,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
            fail "continue to marker1 (demangling)"
             send_gdb "up\n"
             gdb_expect {
-               -re ".*main.*$gdb_prompt $" {}
+               -re ".*main.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
                 -re ".*$gdb_prompt $" {
                    fail "up from marker1"
                }

diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index 21f5f0fc76d3d29f4f12f4b8f7079cd22bd83ae8..85e25a2346e55598334fabaeb452132ced910810 100644 (file)
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -69,7 +69,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-               -re ".*main.*$gdb_prompt $" {}
+               -re ".*main.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
                 -re ".*$gdb_prompt $" {
                    fail "up from marker1"
                }

diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index b7cce5174394f9b6df32c60be77a850de2f7d8be..1c5840873a07a3b803bbe796bbd626dabdd0250f 100644 (file)
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -371,7 +371,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-                -re ".*more_code.*$gdb_prompt $" {}
+                -re ".*more_code.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
                 -re ".*$gdb_prompt $" {
                    fail "up from marker1"
                }

diff --git a/gdb/testsuite/gdb.c++/derivation.exp b/gdb/testsuite/gdb.c++/derivation.exp
index 4b0ff74cf971b5c1b2b4fa7027b2c939c989dd7c..454f236762cf3e4102c3da0c15be9c24a7eff245 100644 (file)
--- a/gdb/testsuite/gdb.c++/derivation.exp
+++ b/gdb/testsuite/gdb.c++/derivation.exp
@@ -76,7 +76,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-                -re ".*main.*$gdb_prompt $" {}
+                -re ".*main.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
                 -re ".*$gdb_prompt $" {
                    fail "up from marker1"
                }

diff --git a/gdb/testsuite/gdb.c++/local.exp b/gdb/testsuite/gdb.c++/local.exp
index 0558860729257328a62c59ad1c54e8448ea76020..22b277b868df1215d445b87ae9c038d312aa753e 100644 (file)
--- a/gdb/testsuite/gdb.c++/local.exp
+++ b/gdb/testsuite/gdb.c++/local.exp
@@ -68,7 +68,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-                -re ".*main.*$gdb_prompt $" {}
+                -re ".*main.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
                 -re ".*$gdb_prompt $" {
                    fail "up from marker1"
                }

diff --git a/gdb/testsuite/gdb.c++/namespace.exp b/gdb/testsuite/gdb.c++/namespace.exp
index 16e6e163ade68ad51a19d80e9acc6e772aec7516..acdffa1b8ac03a7fcdf40cf0487be69eca7ffbf3 100644 (file)
--- a/gdb/testsuite/gdb.c++/namespace.exp
+++ b/gdb/testsuite/gdb.c++/namespace.exp
@@ -74,7 +74,7 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
             send_gdb "up\n"
             gdb_expect {
                 -re ".*main.*$gdb_prompt $" { pass "up from marker1" }
-                -re ".*$gdb_prompt $" { fail "up from marker1" }
+                -re ".*$gdb_prompt $"       { fail "up from marker1" }
                 timeout { fail "up from marker1 (timeout)" }
             }
         }

diff --git a/gdb/testsuite/gdb.c++/overload.exp b/gdb/testsuite/gdb.c++/overload.exp
index 7b3b1aa3f74cd98ccda9277611e38df28f3153ed..1f35402e85a0971c8c7dd2afca4477499096cb3e 100644 (file)
--- a/gdb/testsuite/gdb.c++/overload.exp
+++ b/gdb/testsuite/gdb.c++/overload.exp
@@ -68,7 +68,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-                -re ".*main.*$gdb_prompt $" {}
+                -re ".*main.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
                 -re ".*$gdb_prompt $" {
                    fail "up from marker1"
                }

diff --git a/gdb/testsuite/gdb.c++/ref-types.exp b/gdb/testsuite/gdb.c++/ref-types.exp
index 21e8f7b516bc12b16f5f36cac7c1c3ed6e98835c..e1d654ed2c0004e91a95a2ac7bce50646f6911a0 100644 (file)
--- a/gdb/testsuite/gdb.c++/ref-types.exp
+++ b/gdb/testsuite/gdb.c++/ref-types.exp
@@ -61,7 +61,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-                -re ".*main.*$gdb_prompt $" {}
+                -re ".*main.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
                 -re ".*$gdb_prompt $" {
                    fail "up from marker1"
                }
@@ -101,8 +103,13 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-                -re ".*$gdb_prompt $" {}
-                timeout { fail "up from marker1" }
+                -re ".*main.*$gdb_prompt $" {
+                   pass "up from marker1"
+               }
+                -re ".*$gdb_prompt $" {
+                   fail "up from marker1"
+               }
+                timeout { fail "up from marker1 (timeout)" }
             }
         }
         -re "$gdb_prompt $" { fail "continue to marker1"  }
@@ -290,8 +297,13 @@ send_gdb "break f\n" ; gdb_expect -re ".*$gdb_prompt $"
         -re "Break.* f \\(\\) at .*:$decimal.*$gdb_prompt $" {
             send_gdb "up\n"
             gdb_expect {
-                -re ".*$gdb_prompt $" {}
-                timeout { fail "up from f" }
+                -re ".*main2.*$gdb_prompt $" {
+                   pass "up from f" 
+               }
+                -re ".*$gdb_prompt $" {
+                   fail "up from f" 
+               }
+                timeout { fail "up from f (timeout)" }
             }
         }
         -re "$gdb_prompt $" { fail "continue to f"  }