aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-08-20 18:19:52 +0200
committerPatrik Nyblom <[email protected]>2012-08-20 18:19:52 +0200
commita8fb0d0537314f717f9ab33989a5115457c9aab0 (patch)
tree07dcacdaa266c01391a8e422c60c7b6ff9c810cf /lib/stdlib/test
parent00ef468474d0628903e0a3a3abc7aceb8d2c4061 (diff)
parenta49b1a844febb2740c530895b32c0bb0ae7d5aa0 (diff)
downloadotp-a8fb0d0537314f717f9ab33989a5115457c9aab0.tar.gz
otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.tar.bz2
otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.zip
Merge branch 'maint'
Conflicts: erts/doc/src/erlang.xml erts/preloaded/ebin/init.beam lib/kernel/doc/src/os.xml lib/stdlib/test/filename_SUITE.erl
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r--lib/stdlib/test/filename_SUITE.erl15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/stdlib/test/filename_SUITE.erl b/lib/stdlib/test/filename_SUITE.erl
index 1f3bdbc115..319da00932 100644
--- a/lib/stdlib/test/filename_SUITE.erl
+++ b/lib/stdlib/test/filename_SUITE.erl
@@ -25,7 +25,7 @@
-export([pathtype/1,rootname/1,split/1,find_src/1]).
-export([absname_bin/1, absname_bin_2/1,
basename_bin_1/1, basename_bin_2/1,
- dirname_bin/1, extension_bin/1, join_bin/1]).
+ dirname_bin/1, extension_bin/1, join_bin/1, t_nativename_bin/1]).
-export([pathtype_bin/1,rootname_bin/1,split_bin/1]).
-include_lib("test_server/include/test_server.hrl").
@@ -38,7 +38,7 @@ all() ->
join, pathtype, rootname, split, t_nativename, find_src,
absname_bin, absname_bin_2, basename_bin_1, basename_bin_2, dirname_bin,
extension_bin,
- join_bin, pathtype_bin, rootname_bin, split_bin].
+ join_bin, pathtype_bin, rootname_bin, split_bin, t_nativename_bin].
groups() ->
[].
@@ -688,3 +688,14 @@ split_bin(Config) when is_list(Config) ->
_ ->
ok
end.
+
+t_nativename_bin(Config) when is_list(Config) ->
+ ?line <<"abcedf">> = filename:nativename(<<"abcedf">>),
+ case os:type() of
+ {win32, _} ->
+ ?line <<"a:\\temp\\arne.exe">> =
+ filename:nativename(<<"A:/temp//arne.exe/">>);
+ _ ->
+ ?line <<"/usr/tmp/arne">> =
+ filename:nativename(<<"/usr/tmp//arne/">>)
+ end.