File 1166-reltool-Ignore-ERL_LIBS-in-test-cases.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1166-reltool-Ignore-ERL_LIBS-in-test-cases.patch of Package erlang (Revision 1df3ed72f7aa9edd3e18418a69795124)

Currently displaying revision 1df3ed72f7aa9edd3e18418a69795124 , Show latest

From 6afe80581e58176249a7e4eaa8865b6bd5e442e8 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 19 Feb 2021 16:37:40 +0100
Subject: [PATCH 1/4] reltool: Ignore ERL_LIBS in test cases

If ERL_LIBS is set when the testrun is started
the reltool_server_SUITE fails to run. So we clear
it before we start that suite and restore it
afterwards in case in contains something we need.
---
 lib/reltool/test/reltool_test_lib.erl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl
index 88e5244b8b..4860f7ad66 100644
--- a/lib/reltool/test/reltool_test_lib.erl
+++ b/lib/reltool/test/reltool_test_lib.erl
@@ -27,10 +27,17 @@
 
 init_per_suite(Config) when is_list(Config)->
     global:register_name(reltool_global_logger, group_leader()),
-    incr_timetrap(Config, ?timeout).
+    ErlLibs = os:getenv("ERL_LIBS"),
+    os:unsetenv("ERL_LIBS"),
+    [{erl_libs,ErlLibs}|incr_timetrap(Config, ?timeout)].
 
 end_per_suite(Config) when is_list(Config)->
     global:unregister_name(reltool_global_logger),
+    case proplists:get_value(erl_libs, Config) of
+        false -> ok;
+        ErlLibs ->
+            os:putenv("ERL_LIBS", ErlLibs)
+    end,
     ok.
 
 incr_timetrap(Config, Times) ->
-- 
2.26.2

Places

File 1166-reltool-Ignore-ERL_LIBS-in-test-cases.patch of Package erlang (Revision 1df3ed72f7aa9edd3e18418a69795124)

Places