aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src
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 /lib/common_test/src
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 'lib/common_test/src')
-rw-r--r--lib/common_test/src/ct_config.erl4
-rw-r--r--lib/common_test/src/ct_config_plain.erl2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 6c87b11f8d..e33b47b0e8 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -660,7 +660,7 @@ decrypt_config_file(EncryptFileName, TargetFileName, {key,Key}) ->
get_crypt_key_from_file(File) ->
case file:read_file(File) of
{ok,Bin} ->
- case catch string:lexemes(binary_to_list(Bin), [$\n,$\r]) of
+ case catch string:lexemes(binary_to_list(Bin), [$\n, [$\r,$\n]]) of
[Key] ->
Key;
_ ->
@@ -694,7 +694,7 @@ get_crypt_key_from_file() ->
noent ->
Result;
_ ->
- case catch string:lexemes(binary_to_list(Result), [$\n,$\r]) of
+ case catch string:lexemes(binary_to_list(Result), [$\n, [$\r,$\n]]) of
[Key] ->
io:format("~nCrypt key file: ~ts~n", [FullName]),
Key;
diff --git a/lib/common_test/src/ct_config_plain.erl b/lib/common_test/src/ct_config_plain.erl
index e77381d7cf..d525019f7b 100644
--- a/lib/common_test/src/ct_config_plain.erl
+++ b/lib/common_test/src/ct_config_plain.erl
@@ -106,7 +106,7 @@ read_config_terms1({done,{eof,EL},_}, L, _, _) ->
read_config_terms1({done,{error,Info,EL},_}, L, _, _) ->
{error,{Info,{L,EL}}};
read_config_terms1({more,_}, L, Terms, Rest) ->
- case string:lexemes(Rest, [$\n,$\r,$\t]) of
+ case string:lexemes(Rest, [$\n,[$\r,$\n],$\t]) of
[] ->
lists:reverse(Terms);
_ ->