diff options
| author | Hans Bolinder <[email protected]> | 2018-01-23 11:37:34 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-01-23 11:37:34 +0100 |
| commit | 716ef17d2a00c7f4a5a5cf92fffd18adb94c542d (patch) | |
| tree | f517f0ae5ed2c1a6546d5d18df46dcfaf03935e1 /lib/stdlib/test/epp_SUITE.erl | |
| parent | b7ff9c0d76372f16d14ecaac04c6fbbbadaf9435 (diff) | |
| parent | dc6a03a8351819a91c1e9235dd84df0acd4ba6b8 (diff) | |
| download | otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.tar.gz otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.tar.bz2 otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.zip | |
Merge branch 'maint'
* maint:
kernel: Correct contracts and a bug in group_history
stdlib: Correct contracts
dialyzer: Optimize handling of a lot of warnings
Conflicts:
lib/kernel/src/erl_boot_server.erl
Diffstat (limited to 'lib/stdlib/test/epp_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/epp_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl index 915f478dfa..9123bf2f28 100644 --- a/lib/stdlib/test/epp_SUITE.erl +++ b/lib/stdlib/test/epp_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2017. All Rights Reserved. +%% Copyright Ericsson AB 1998-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -551,8 +551,8 @@ otp_8130(Config) when is_list(Config) -> "t() -> " " L = \"{ 34 , \\\"1\\\\x{AAA}\\\" , \\\"34\\\" , X . a , $\\\\x{AAA} }\", " " R = ?M({34,\"1\\x{aaa}\",\"34\",X.a,$\\x{aaa}})," - " Lt = erl_scan:string(L, 1, [unicode])," - " Rt = erl_scan:string(R, 1, [unicode])," + " Lt = erl_scan:string(L, 1)," + " Rt = erl_scan:string(R, 1)," " Lt = Rt, ok. ">>, ok}, |