From beb08eb751fa8e1f72042f263316ab5e5ddb596d Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Wed, 10 Nov 2021 00:54:13 -0500
Subject: New upstream version 2.4.0+dfsg.

---
 src/test/integtests/platform/XWindowsScreenSaverTests.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/test/integtests/platform/XWindowsScreenSaverTests.cpp')

diff --git a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
index c6a2710..a3af21d 100644
--- a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
+++ b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
@@ -23,6 +23,7 @@
 #include "platform/XWindowsScreenSaver.h"
 
 #include "test/global/gtest.h"
+#include <cstdlib>
 #include <X11/Xlib.h>
 
 using ::testing::_;
@@ -30,7 +31,12 @@ using ::testing::_;
 // TODO: not working on build machine for some reason
 TEST(CXWindowsScreenSaverTests, activate_defaultScreen_todo)
 {
-    Display* display = XOpenDisplay(":0.0");
+    const char* displayName = std::getenv("DISPLAY");
+    if (displayName == NULL) {
+        displayName = ":0.0";
+    }
+
+    Display* display = XOpenDisplay(displayName);
     Window window = DefaultRootWindow(display);
     MockEventQueue eventQueue;
     EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(1);
-- 
cgit v1.2.3