File 0494-make-sure-a-set-ERL_LIBS-does-not-interfer... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0494-make-sure-a-set-ERL_LIBS-does-not-interfere-with-tes.patch of Package erlang (Revision 88a02c2ce6d63718530f078daeb49b67)

Currently displaying revision 88a02c2ce6d63718530f078daeb49b67 , Show latest

From 3db745cf3b621cc343565e98f32e66e486523b42 Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Thu, 4 Oct 2018 14:15:08 +0200
Subject: [PATCH] make sure a set ERL_LIBS does not interfere with tests

---
 lib/kernel/test/code_SUITE.erl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 1314316c13..f9b6159e24 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1021,6 +1021,13 @@ mult_lib_remove_prefix([H|T1], [H|T2]) ->
 mult_lib_remove_prefix([$/|T], []) -> T.
 
 bad_erl_libs(Config) when is_list(Config) ->
+    %% Preserve ERL_LIBS if set.
+    BadLibs0 = "/no/such/dir",
+    BadLibs =
+         case os:getenv("ERL_LIBS") of
+             false -> BadLibs0;
+             Libs -> BadLibs0 ++ ":" ++ Libs
+         end,
     {ok,Node} =
 	test_server:start_node(bad_erl_libs, slave, []),
     Code = rpc:call(Node,code,get_path,[]),
@@ -1028,10 +1035,9 @@ bad_erl_libs(Config) when is_list(Config) ->
 
     {ok,Node2} =
 	test_server:start_node(bad_erl_libs, slave,
-			       [{args,"-env ERL_LIBS /no/such/dir"}]),
+			       [{args,"-env ERL_LIBS " ++ BadLibs}]),
     Code2 = rpc:call(Node,code,get_path,[]),
     test_server:stop_node(Node2),
-
     %% Test that code path is not affected by the faulty ERL_LIBS
     Code = Code2,
 
-- 
2.16.4

Places

File 0494-make-sure-a-set-ERL_LIBS-does-not-interfere-with-tes.patch of Package erlang (Revision 88a02c2ce6d63718530f078daeb49b67)

Places