aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-01-25 11:31:28 +0100
committerSiri Hansen <[email protected]>2013-01-25 15:56:01 +0100
commitb7777781864df9df281b521326db4210beaf9f6e (patch)
treeeb84eb48e9bf57f16ff5d2aff9896df86682b698 /lib
parentf234422cd0599a935909da936ea8893cb2087f9a (diff)
downloadotp-b7777781864df9df281b521326db4210beaf9f6e.tar.gz
otp-b7777781864df9df281b521326db4210beaf9f6e.tar.bz2
otp-b7777781864df9df281b521326db4210beaf9f6e.zip
[test_server] Don't create latin1 filenames if filename mode is utf8
Skipping test_server_latin1_***_SUITE if filename:native_name_encoding is utf8.
Diffstat (limited to 'lib')
-rw-r--r--lib/test_server/test/test_server_SUITE.erl13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index bad35b2d51..bea2c0dc49 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -185,13 +185,14 @@ test_server_unicode(Config) ->
5, 0, 3, 3, 0, 0, 0, 0, 5, Config),
%% Create and run two test suites - one with filename and content
- %% in latin1 (not on windows) and one with filename and content in
- %% utf8. Both have name and content including letters ���. Check
- %% that all logs are generated with utf8 encoded filenames.
- case os:type() of
- {win32,_} ->
+ %% in latin1 (if the default filename mode is latin1) and one with
+ %% filename and content in utf8. Both have name and content
+ %% including letters ���. Check that all logs are generated with
+ %% utf8 encoded filenames.
+ case file:native_name_encoding() of
+ utf8 ->
ok;
- _ ->
+ latin1 ->
generate_and_run_unicode_test(Config,latin1)
end,
generate_and_run_unicode_test(Config,utf8).