[test_server] Don't create latin1 filenames if filename mode is utf8

Skipping test_server_latin1_***_SUITE if filename:native_name_encoding
is utf8.

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).