From ab3332517f9181e8c18a03d42d302233183980fd Mon Sep 17 00:00:00 2001
From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Wed, 20 Oct 2010 13:08:32 +0000
Subject: [PATCH] Check for window manager before running GUI tests on unix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/buildbot/config/include/defs.xml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
index 487751772f..d589ed387d 100644
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -390,10 +390,26 @@ try()
 
 try ./test <xsl:value-of select="normalize-space($options)"/>
 
-if [ -n "$DISPLAY" -a -x test_gui ]; then
-    try ./test_gui <xsl:value-of select="normalize-space($guioptions)"/>
+test -x test_gui || exit $ERR
+
+if [ -z "$DISPLAY" ]; then
+    echo '$DISPLAY is not set, skipping GUI tests.'
+    exit $ERR
+fi
+
+echo 'Checking window manager:'
+WINDOW_MANAGER=$(xprop -root 32x '\n$0\n' _NET_SUPPORTING_WM_CHECK | grep ^0x)
+
+if [ -z "$WINDOW_MANAGER" ]; then
+    echo 'Window manager not present, skipping GUI tests.'
+    exit $ERR
 fi
 
+xprop -id $WINDOW_MANAGER 8s _NET_WM_NAME
+echo
+
+try ./test_gui <xsl:value-of select="normalize-space($guioptions)"/>
+
 exit $ERR
 </xsl:template>
 
-- 
2.47.2