diff options
| author | Siri Hansen <[email protected]> | 2012-02-29 11:18:08 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-19 09:48:54 +0100 |
| commit | 70b56b16177703c4721f9afbb0329b181af1de3e (patch) | |
| tree | 2b734f6953951631bf65b0da07b1c2d33f49c698 /lib/reltool | |
| parent | 537773c0e6969cb89f92aec0244ba29b07ec66ea (diff) | |
| download | otp-70b56b16177703c4721f9afbb0329b181af1de3e.tar.gz otp-70b56b16177703c4721f9afbb0329b181af1de3e.tar.bz2 otp-70b56b16177703c4721f9afbb0329b181af1de3e.zip | |
[reltool] Unset ERL_FLAGS when running escript from reltool_server_SUITE
OTP-9794
Some escript tests in reltool_server_SUITE failed if ERL_FLAGS was set
to enable smp. The reason is that the test expected smp_support to be
false, since the argument "-smp disable" is stated in the %%!-line of
the escript. However, ERL_FLAGS will override the arguments in the
escript so the result could not be truested.
Diffstat (limited to 'lib/reltool')
| -rw-r--r-- | lib/reltool/test/reltool_server_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl index 5526df5f52..c1d568f019 100644 --- a/lib/reltool/test/reltool_server_SUITE.erl +++ b/lib/reltool/test/reltool_server_SUITE.erl @@ -2150,7 +2150,9 @@ run(Dir, Opts, Script, Args) -> do_run(Dir, Cmd) -> io:format("Run: ~p\n", [Cmd]), - Env = [{"PATH",Dir++":"++os:getenv("PATH")}], + Env = [{"PATH",Dir++":"++os:getenv("PATH")}, + {"ERL_FLAGS",""}, % Make sure no flags are set that can override + {"ERL_ZFLAGS",""}], % any of the flags set in the escript. Port = open_port({spawn,Cmd}, [exit_status,eof,in,{env,Env}]), Res = get_data(Port, []), receive |