diff options
| author | Lars Thorsen <[email protected]> | 2014-03-28 10:21:45 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2014-03-28 10:21:45 +0100 |
| commit | f558e4a3744333507a92fb8fbbf8dc58a254f05f (patch) | |
| tree | d91bc5806e1cc071226e7630845a246218dc622f /erts | |
| parent | 7811310ee2c72173824007d3db73ae2b62a725d9 (diff) | |
| parent | e10e918f3c08245949297e5ff1483752dd196e88 (diff) | |
| download | otp-f558e4a3744333507a92fb8fbbf8dc58a254f05f.tar.gz otp-f558e4a3744333507a92fb8fbbf8dc58a254f05f.tar.bz2 otp-f558e4a3744333507a92fb8fbbf8dc58a254f05f.zip | |
Merge branch 'lars/ic/unicode/OTP-11783'
* lars/ic/unicode/OTP-11783:
Remove orber/cos*/ic files from encoding test
[ic] Fix unicode option to io:format in java test
[ic] Fix unicode in erlang install path
[ic] Fix latin-1 characters in generated erl file
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/test/otp_SUITE.erl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl index 1fb452501f..cd5cfcbab4 100644 --- a/erts/test/otp_SUITE.erl +++ b/erts/test/otp_SUITE.erl @@ -328,7 +328,9 @@ erl_file_encoding(_Config) -> Wc = filename:join([Root,"**","*.erl"]), ErlFiles = ordsets:subtract(ordsets:from_list(filelib:wildcard(Wc)), release_files(Root, "*.erl")), + {ok, MP} = re:compile(".*lib/(ic)|(orber)|(cos).*", [unicode]), Fs = [F || F <- ErlFiles, + filter_use_latin1_coding(F, MP), case epp:read_encoding(F) of none -> false; _ -> true @@ -342,6 +344,14 @@ erl_file_encoding(_Config) -> ?t:fail() end. +filter_use_latin1_coding(F, MP) -> + case re:run(F, MP) of + nomatch -> + true; + {match, _} -> + false + end. + xml_file_encoding(_Config) -> XmlFiles = xml_files(), Fs = [F || F <- XmlFiles, is_bad_encoding(F)], |