File 0181-observer-Skip-testing-on-sunos.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0181-observer-Skip-testing-on-sunos.patch of Package erlang (Revision 8ae270ec351a9967251049ec5fe5606a)

Currently displaying revision 8ae270ec351a9967251049ec5fe5606a , Show latest

From 173604dd1687264187a6671f1d5bc122c130f5ed Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Fri, 12 Nov 2021 10:06:51 +0100
Subject: [PATCH 1/4] observer: Skip testing on sunos

With the current wxWidgets/gtk and/or test X-server version,
the tests crash when closing the window.

This only happens if the application sets an icon on the top-frame,
so something is broken in those libraries when deleting the window.

Skip tests for now, since both observer and crashdump_viewer sets an
icon.
---
 lib/observer/test/crashdump_viewer_SUITE.erl | 11 +++++++++--
 lib/observer/test/observer_SUITE.erl         | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index fdc235a3a3..901600ae09 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -45,11 +45,18 @@ init_per_testcase(start_stop, Config) ->
 	case os:type() of
 	    {unix,darwin} ->
 		exit("Can not test on MacOSX");
+            {unix,sunos} ->
+                exit("Skip on sunos, for now");
 	    {unix, _} ->
-		io:format("DISPLAY ~s~n", [os:getenv("DISPLAY")]),
+                Display = os:getenv("DISPLAY"),
+		io:format("DISPLAY ~s~n", [Display]),
 		case ct:get_config(xserver, none) of
 		    none -> ignore;
-		    Server -> os:putenv("DISPLAY", Server)
+                    Display -> ok;
+		    Server ->
+                        os:putenv("DISPLAY", Server), %% Might work if new node is spawned
+                        io:format("Config sets other x-server than the DISPLAY\n"
+                                  "the DISPLAY variable must be set when starting erlang")
 		end;
 	    _ -> ignore
 	end,
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 7d5e90d2ce..575f63b956 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -96,12 +96,19 @@ init_per_group(gui = Group, Config) ->
 	    {unix,darwin} ->
 		?P("init_per_group(~w) -> skip", [Group]),
 		exit("Can not test on MacOSX");
+            {unix,sunos} ->
+                exit("Skip on sunos, for now");
 	    {unix, _} ->
+                Display = os:getenv("DISPLAY"),
 		?P("init_per_group(~w) -> DISPLAY ~s",
-                   [Group, os:getenv("DISPLAY")]),
+                   [Group, Display]),
 		case ct:get_config(xserver, none) of
 		    none -> ignore;
-		    Server -> os:putenv("DISPLAY", Server)
+                    Display -> ok;
+		    Server ->
+                        os:putenv("DISPLAY", Server), %% Might work if new node is spawned
+                        io:format("Config sets other x-server than the DISPLAY\n"
+                                  "the DISPLAY variable must be set when starting erlang")
 		end;
 	    _ -> ignore
 	end,
-- 
2.31.1

Places

File 0181-observer-Skip-testing-on-sunos.patch of Package erlang (Revision 8ae270ec351a9967251049ec5fe5606a)

Places