* gdb.base/testenv.exp: Skip on remote targets. Unset global

	environment variable after test completed.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6ed0407cc3ed9d504dc98511aa64acc4e53a4dce..866593ec44452f800761bcda526d73f44bed1644 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * gdb.base/testenv.exp: Skip on remote targets.  Unset global
+       environment variable after test completed.
+
 2011-11-30  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * gdb.base/solib-nodir.exp: Skip if remote target.

diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp
index ad39f1451d7fc06fb18720ba9839d1e377cbb134..dae35b6f888e3cc9d4e584a083b1ce331c24b2e8 100644 (file)
--- a/gdb/testsuite/gdb.base/testenv.exp
+++ b/gdb/testsuite/gdb.base/testenv.exp
@@ -22,6 +22,10 @@ if $tracelevel then {
        strace $tracelevel
 }
 
+# There's no support for passing environment variables in the remote protocol.
+if { [is_remote target] } {
+    return 0
+}
 
 set testfile "testenv"
 set srcfile ${testfile}.c
@@ -119,3 +123,7 @@ gdb_test "continue" \
   "Test with TEST_GDB_GLOBAL unset"
 
 gdb_exit
+
+# Clear environment in case we're doing multiple runs
+unset env(TEST_GDB_GLOBAL)
+