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 c90bdc1..aabec46 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,16 @@
 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.
        * gdb.base/miscexprs.exp: Ditto.
        * gdb.base/pointers.exp:  Ditto.

diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index 1cdc231..f9d1b24 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 21f5f0f..85e25a2 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 b7cce51..1c58408 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 4b0ff74..454f236 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 0558860..22b277b 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 16e6e16..acdffa1 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 7b3b1aa..1f35402 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 21e8f7b..e1d654e 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"  }