aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2018-03-27 15:05:13 +0200
committerDan Gudmundsson <[email protected]>2018-03-27 15:05:13 +0200
commitacfd88f41fbea76650d270f0bb96b6e3975d1480 (patch)
treea53f8b755351b213ba9de9488597c254d0566fa3 /erts
parent05cf376180ba1f70c9788b145b6c5ad5751a982d (diff)
parenteae5b5723faadcae106c6e4f9fa486938bc08cdf (diff)
downloadotp-acfd88f41fbea76650d270f0bb96b6e3975d1480.tar.gz
otp-acfd88f41fbea76650d270f0bb96b6e3975d1480.tar.bz2
otp-acfd88f41fbea76650d270f0bb96b6e3975d1480.zip
Merge branch 'dgud/testcase-fixes'
* dgud/testcase-fixes: debug info add unicode opt env may contain unicode signs Fix lexemes conversion
Diffstat (limited to 'erts')
-rw-r--r--erts/test/erlexec_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index db993abe52..73ed0ac56a 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -400,7 +400,7 @@ emu_args(CmdLineArgs) ->
{ok,[[Erl]]} = init:get_argument(progname),
EmuCL = os:cmd(Erl ++ " -emu_args_exit " ++ CmdLineArgs),
io:format("EmuCL = ~ts", [EmuCL]),
- split_emu_clt(string:lexemes(EmuCL, [$ ,$\t,$\n,$\r])).
+ split_emu_clt(string:lexemes(EmuCL, [$ ,$\t,$\n,[$\r,$\n]])).
split_emu_clt(EmuCLT) ->
split_emu_clt(EmuCLT, [], [], [], emu).