diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-14 12:05:01 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-14 12:05:01 +0100 |
| commit | 856f165d08b03a85a96389c4795e8b1b019e30f3 (patch) | |
| tree | 472ddeb664aa4eae2c8ec3424fcc6a160c490f0b /lib/kernel | |
| parent | 9905024a8b7d9a26f7fdf6640ab391c5cb8f6780 (diff) | |
| parent | 5abcc77292e59a951e5a53c1641081f973d25c90 (diff) | |
| download | otp-856f165d08b03a85a96389c4795e8b1b019e30f3.tar.gz otp-856f165d08b03a85a96389c4795e8b1b019e30f3.tar.bz2 otp-856f165d08b03a85a96389c4795e8b1b019e30f3.zip | |
Merge branch 'bjorn/stdlib/filelib-wildcard/OTP-10812'
* bjorn/stdlib/filelib-wildcard/OTP-10812:
Remove special case handling "-" at the beginning of a charset
Optimize character sets using gb_sets
Clean up and simplify the inner matching loop
Only sort the result list once, just before returning
Replace filename:join/2 with '++'
Rethink the filelib:wildcard() functions
Don't redefine error/1
Don't allow binaries as the Cwd argument for filelib:wildcard()
Don't handle binaries from file:list_dir/1
Strengthen test suite
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/test/file_name_SUITE.erl | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl index 40bde8a736..e8529db1dc 100644 --- a/lib/kernel/test/file_name_SUITE.erl +++ b/lib/kernel/test/file_name_SUITE.erl @@ -575,17 +575,6 @@ check_very_icky(Mod) -> end, ?line {NumOK,NumNOK} = filelib:fold_files(".",".*",true,fun(_F,{N,M}) when is_list(_F) -> io:format("~ts~n",[_F]),{N+1,M}; (_F,{N,M}) -> io:format("~p~n",[_F]),{N,M+1} end,{0,0}), ?line ok = filelib:fold_files(".",[1076,1089,1072,124,46,42],true,fun(_F,_) -> ok end,false), - ?line SF3 = unicode:characters_to_binary("åäösubfil3", - file:native_name_encoding()), - ?line SF2 = case treat_icky(<<"åäösubfil2">>) of - LF2 when is_list(LF2) -> - unicode:characters_to_binary(LF2, - file:native_name_encoding()); - BF2 -> - BF2 - end, - ?line Sorted = lists:sort([SF3,SF2]), - ?line Sorted = lists:sort(filelib:wildcard("*",<<"åäösubdir2">>)), ok catch throw:need_unicode_mode -> |