Use -wrap in two test cases

Both Baris and Tom pointed out spots in recent patches where -wrap
could have been used.  This patch changes both the relevant tests to
use it.

diff --git a/gdb/testsuite/gdb.base/environ.exp b/gdb/testsuite/gdb.base/environ.exp
index 091010acfda4a7ae23ec76b6f3067eabe5399c42..73b8e7d3c57faf7082ce3f7240f9182be0c7dc9d 100644 (file)
--- a/gdb/testsuite/gdb.base/environ.exp
+++ b/gdb/testsuite/gdb.base/environ.exp
@@ -42,7 +42,7 @@ gdb_test_multiple "show environment" "show environment works" -lbl {
        exp_continue
     }
 
-    -re "\r\n$gdb_prompt $" {
+    -re -wrap "" {
     }
 }
 

diff --git a/gdb/testsuite/gdb.base/local-env.exp b/gdb/testsuite/gdb.base/local-env.exp
index c62ea7466354a0b29b2d13e27053c915053f8487..77151f0b7d10e3fe52004b740a6746a13db53657 100644 (file)
--- a/gdb/testsuite/gdb.base/local-env.exp
+++ b/gdb/testsuite/gdb.base/local-env.exp
@@ -44,7 +44,7 @@ gdb_test_multiple "show environment" "show environment works" -lbl {
        exp_continue
     }
 
-    -re "\r\n$gdb_prompt $" {
+    -re -wrap "" {
     }
 }