diff options
| author | Lukas Larsson <lukas@erlang.org> | 2019-11-14 15:40:12 +0100 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2019-11-14 15:40:12 +0100 |
| commit | 80f6f9ec204ba48b7ae866b8a4afdd5e7a4cd47c (patch) | |
| tree | fb4ac36f1eb1929d466af425cff18eac67db1126 /lib/reltool | |
| parent | 889977cb768165efd1765f0c9b66dcb4c167bde1 (diff) | |
| parent | a6724237645354f5869f6d89f419e0c4eb3548bf (diff) | |
| download | erlang-80f6f9ec204ba48b7ae866b8a4afdd5e7a4cd47c.tar.gz | |
Merge branch 'maint'
Diffstat (limited to 'lib/reltool')
| -rw-r--r-- | lib/reltool/examples/display_args | 2 | ||||
| -rw-r--r-- | lib/reltool/test/reltool_server_SUITE.erl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/reltool/examples/display_args b/lib/reltool/examples/display_args index a8882f7bda..38f749f8b2 100644 --- a/lib/reltool/examples/display_args +++ b/lib/reltool/examples/display_args @@ -1,6 +1,6 @@ #!/usr/bin/env escript %% -*- erlang -*- -%%! -emuarg emuvalue +%%! -emu_type opt -emuarg emuvalue main(Args) -> {ok,[Emuvalue]} = init:get_argument(emuarg), diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl index bb092e8bbf..500b298424 100644 --- a/lib/reltool/test/reltool_server_SUITE.erl +++ b/lib/reltool/test/reltool_server_SUITE.erl @@ -2792,6 +2792,8 @@ mk_node_args(Name, Args) -> {ok, Pwd} = file:get_cwd(), NameStr = atom_to_list(Name), ["-detached", + %% Don't want to try to run the debug emulator here + "-emu_type","opt", NameSw, NameStr, "-pa", Pa, "-env", "ERL_CRASH_DUMP", Pwd ++ "/erl_crash_dump." ++ NameStr, |