summaryrefslogtreecommitdiff
path: root/lib/reltool
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang.org>2021-03-12 09:44:00 +0100
committerLukas Larsson <lukas@erlang.org>2021-03-12 09:44:00 +0100
commitf0af939f61208c0e0cf8b1bb93b53092f138e5ca (patch)
tree88f63958e7d97a1e7510ec7c27757b25856cdb21 /lib/reltool
parent27622dd0613b543bac14a3c3d6b2718e5238093e (diff)
parent67ab283ade780d1dfe95e45e6db61f9dd0fab274 (diff)
downloaderlang-f0af939f61208c0e0cf8b1bb93b53092f138e5ca.tar.gz
Merge branch 'maint'
Diffstat (limited to 'lib/reltool')
-rw-r--r--lib/reltool/test/reltool_test_lib.erl9
1 files changed, 8 insertions, 1 deletions
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) ->