diff options
| author | Björn Gustavsson <[email protected]> | 2019-04-11 13:11:36 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2019-04-11 13:11:36 +0200 |
| commit | 0e635324b19dd203454f41b41df7a7bb799bc40a (patch) | |
| tree | 8f1aa03d58b50e937a8c89ae78a09e05b50ee8e5 /lib/common_test | |
| parent | 4ac92628f07df87787888fd47a3efa11c9025e5e (diff) | |
| parent | 21f95e607ea584b84102fd45cb138277760b1c6d (diff) | |
| download | otp-0e635324b19dd203454f41b41df7a7bb799bc40a.tar.gz otp-0e635324b19dd203454f41b41df7a7bb799bc40a.tar.bz2 otp-0e635324b19dd203454f41b41df7a7bb799bc40a.zip | |
Merge branch 'bjorn/ct/clear_erl_aflags'
* bjorn/ct/clear_erl_aflags:
Clear ERL_AFLAGS when starting a previous release
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/src/test_server_node.erl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl index 3ae4a047d8..c11b9071cf 100644 --- a/lib/common_test/src/test_server_node.erl +++ b/lib/common_test/src/test_server_node.erl @@ -598,11 +598,20 @@ pick_erl_program(L) -> {prog, S} -> S; {release, S} -> + clear_erl_aflags(), find_release(S); this -> ct:get_progname() end. +clear_erl_aflags() -> + %% When starting a node with a previous release, options in + %% ERL_AFLAGS could prevent the node from starting. For example, + %% if ERL_AFLAGS is set to "-emu_type lcnt", the node will only + %% start if the previous release happens to also have a lock + %% counter emulator installed (unlikely). + os:unsetenv("ERL_AFLAGS"). + %% This is an attempt to distinguish between spaces in the program %% path and spaces that separate arguments. The program is quoted to %% allow spaces in the path. |