Encode Erlang source files with non-ascii characters in UTF-8

To ensure that 'master' compiles when we merge 'maint' to it,
regardless of which encoding is default in 'master', all source
files with non-ascii characters *must* have the encoding specified.

2 files changed, 9 insertions, 7 deletions

diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index 5584c1e50c..d0f40c47a7 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -214,7 +215,7 @@ html_encoding(utf8) ->
 %%% from the source.
 %%%
 %%% Example: if the encoding of the file is utf8, and we have a string
-%%% containing "�" = [229], then we need to convert this to [195,165]
+%%% containing "å" = [229], then we need to convert this to [195,165]
 %%% before writing. Note that this conversion is only necessary
 %%% because the destination file is not (necessarily) opened with utf8
 %%% encoding - it is opened with default encoding in order to allow
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index 3db2f5f9f1..8ad5fcfb5c 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -187,7 +188,7 @@ test_server_unicode(Config) ->
     %% Create and run two test suites - one with filename and content
     %% 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
+    %% including letters äöå.  Check that all logs are generated with
     %% utf8 encoded filenames.
     case file:native_name_encoding() of
 	utf8 ->
@@ -348,7 +349,7 @@ generate_and_run_unicode_test(Config0,Encoding) ->
     SuiteHtml = translate_filename(LowerModStr++".src.html",Encoding),
     true = filelib:is_regular(filename:join(RunDir,SuiteHtml)),
 
-    TCLog = translate_filename(LowerModStr++".tc_���.html",Encoding),
+    TCLog = translate_filename(LowerModStr++".tc_äöå.html",Encoding),
     true = filelib:is_regular(filename:join(RunDir,TCLog)),
     ok.
 
@@ -370,7 +371,7 @@ start_node(Config,Name,Args) ->
     end.
 
 create_unicode_test_suite(Dir,Encoding) ->
-    ModStr = "test_server_"++atom_to_list(Encoding)++"_���_SUITE",
+    ModStr = "test_server_"++atom_to_list(Encoding)++"_äöå_SUITE",
     File = filename:join(Dir,ModStr++".erl"),
     Suite =
 	["%% -*- ",epp:encoding_to_string(Encoding)," -*-\n",
@@ -378,12 +379,12 @@ create_unicode_test_suite(Dir,Encoding) ->
 	 "\n"
 	 "-export([all/1, init_per_suite/1, end_per_suite/1]).\n"
 	 "-export([init_per_testcase/2, end_per_testcase/2]).\n"
-	 "-export([tc_���/1]).\n"
+	 "-export([tc_äöå/1]).\n"
 	 "\n"
 	 "-include_lib(\"test_server/include/test_server.hrl\").\n"
 	 "\n"
 	 "all(suite) ->\n"
-	 "    [tc_���].\n"
+	 "    [tc_äöå].\n"
 	 "\n"
 	 "init_per_suite(Config) ->\n"
 	 "    Config.\n"
@@ -406,7 +407,7 @@ create_unicode_test_suite(Dir,Encoding) ->
 	 "    ?t:timetrap_cancel(Dog),\n"
 	 "    ok.\n"
 	 "\n"
-	 "tc_���(Config) when is_list(Config) ->\n"
+	 "tc_äöå(Config) when is_list(Config) ->\n"
 	 "    true = filelib:is_dir(?config(priv_dir,Config)),\n"
 	 "    ok.\n"],
     {ok,Fd} = file:open(raw_filename(File,Encoding),[write,{encoding,Encoding}]),