Merge branch 'siri/cuddle-with-tests' into maint

* siri/cuddle-with-tests:
  [sasl] Fix tests that compare execution time
  [jinterface] Kill process between tests to avoid consequential error
  [jinterface] Make tests handle space in path on windows
  [common_test] Extend timers for slave nodes in ct_cover_SUITE
  [test_server] Clean up unused code in test_server_SUITE
  [reltool] Increase timetrap timeout for reltool_server_SUTIE to 10 minutes
  [test_server] Fix encoding of HTML file references to work on windows
  [test_server] Use simpler tc name in unicode test to make it work on windows

2 files changed, 16 insertions, 19 deletions

diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index 9c0ca64173..5584c1e50c 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -126,7 +126,7 @@ build_html(SFd,DFd,Encoding,Functions) ->
     build_html(SFd,DFd,Encoding,file:read_line(SFd),1,Functions,false).
 
 build_html(SFd,DFd,Encoding,{ok,Str},L,[{F,A,L}|Functions],_IsFuncDef) ->
-    FALink = http_uri:encode(F++"-"++integer_to_list(A)),
+    FALink = test_server_ctrl:uri_encode(F++"-"++integer_to_list(A),utf8),
     file:write(DFd,["<a name=\"",to_raw_list(FALink,Encoding),"\"/>"]),
     build_html(SFd,DFd,Encoding,{ok,Str},L,Functions,true);
 build_html(SFd,DFd,Encoding,{ok,Str},L,[{clause,L}|Functions],_IsFuncDef) ->
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index a5216571c7..21c10adccb 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -5326,31 +5326,28 @@ uri_encode(File,Encoding) ->
     Components = filename:split(File),
     filename:join([uri_encode_comp(C,Encoding) || C <- Components]).
 
-uri_encode_comp("/",_) ->
-    "/";
-uri_encode_comp(Chars,utf8) ->
-    http_uri:encode(Chars);
-uri_encode_comp(Chars,latin1) ->
-    do_uri_encode(Chars).
-
-%% Encode a file reference to a latin1 filename so it can be inserted
-%% in a utf8 encoded HTML file.
-%% This does the same as http_uri:encode/1, except it also encodes all
-%% characters >127 - i.e. latin1 but not ASCII.
-do_uri_encode([Char|Chars]) ->
-    case Char>127 orelse sets:is_element(Char, reserved()) of
+%% Encode the reference to a "filename of the given encoding" so it
+%% can be inserted in a utf8 encoded HTML file.
+%% This does almost the same as http_uri:encode/1, except
+%% 1. it does not convert @, : and / (in order to preserve nodename and c:/)
+%% 2. if the file name is in latin1, it also encodes all
+%%    characters >127 - i.e. latin1 but not ASCII.
+uri_encode_comp([Char|Chars],Encoding) ->
+    Reserved = sets:is_element(Char, reserved()),
+    case (Char>127 andalso Encoding==latin1) orelse Reserved of
 	true ->
-	    [ $% | http_util:integer_to_hexlist(Char)] ++ do_uri_encode(Chars);
+	    [ $% | http_util:integer_to_hexlist(Char)] ++
+		uri_encode_comp(Chars,Encoding);
 	false ->
-	    [Char | do_uri_encode(Chars)]
+	    [Char | uri_encode_comp(Chars,Encoding)]
     end;
-do_uri_encode([]) ->
+uri_encode_comp([],_) ->
     [].
 
 %% Copied from http_uri.erl, but slightly modified
-%% (not converting @ and :)
+%% (not converting @, : and /)
 reserved() ->
-    sets:from_list([$;, $&, $=, $+, $,, $/, $?,
+    sets:from_list([$;, $&, $=, $+, $,, $?,
 		    $#, $[, $], $<, $>, $\", ${, $}, $|,
                     $\\, $', $^, $%, $ ]).