aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-12-20 15:18:59 +0100
committerPatrik Nyblom <[email protected]>2010-12-20 15:19:15 +0100
commitefb4fe5f64e3470a4aa9626cc3d8a2e136183cae (patch)
tree46728ad3f877cee55cb304e9bc64a1c80a9d6f31 /lib
parentcafd7841c7ebd17ac50d6b428887798b75375a86 (diff)
parente6371155f2466067541eecafd1ec2a9c8e4a614b (diff)
downloadotp-efb4fe5f64e3470a4aa9626cc3d8a2e136183cae.tar.gz
otp-efb4fe5f64e3470a4aa9626cc3d8a2e136183cae.tar.bz2
otp-efb4fe5f64e3470a4aa9626cc3d8a2e136183cae.zip
Merge branch 'pan/unicode-filenames/testcase-correction' into dev
* pan/unicode-filenames/testcase-correction: Make file_name_SUITE:very_icky work on Windows OTP-8887
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/test/file_name_SUITE.erl12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index fea4df8539..fbafbcd9b7 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -507,8 +507,16 @@ 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 Sorted = lists:sort([SF3,<<"���subfil2">>]),
+ ?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