* lib/gdb.exp (_gdbtk_xvfb_init): If GDB_DISPLAY is

	the empty string, do not run the tests.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 844e4c028b5c0011a1baf6af6efd525abf0663e1..137be01126852a0ec6838dee79c09e731dbc7ead 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-22  Keith Seitz  <keiths@redhat.com>
+
+       * lib/gdb.exp (_gdbtk_xvfb_init): If GDB_DISPLAY is
+       the empty string, do not run the tests.
+
 2001-07-17  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
        * gdb.base/long_long.exp: Detect size of pointer.  Take into

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 73df80f53a7bb47f10807a48dc0afdca8709ce8e..4949083de4ba842a96f08c0979e3cd765e4258cb 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1698,14 +1698,19 @@ proc gdbtk_start {test} {
 
 # Start xvfb when using it.
 # The precedence is:
-#   1. If GDB_DISPLAY is set, use it
+#   1. If GDB_DISPLAY is set (and not ""), use it
 #   2. If Xvfb exists, use it (not on cygwin)
 #   3. Skip tests
 proc _gdbtk_xvfb_init {} {
   global env spawn_id _xvfb_spawn_id _using_windows
 
   if {[info exists env(GDB_DISPLAY)]} {
-    set env(DISPLAY) $env(GDB_DISPLAY)
+    if {$env(GDB_DISPLAY) != ""} {
+      set env(DISPLAY) $env(GDB_DISPLAY)
+    } else {
+      # Suppress tests
+      return 0
+    }
   } elseif {!$_using_windows && [which Xvfb] != 0} {
     set screen ":[getpid]"
     set pid [spawn  Xvfb $screen]