3 files changed, 79 insertions, 7 deletions

diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index af3ce88fdd..146c915087 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -151,10 +151,9 @@ t_swap_keys_file([File|Files]) ->
 
 %% Simple smoke test of actual lock-counting, if running on
 %% a run-time with lock-counting enabled.
-
 smoke_lcnt(Config) ->
-    case erlang:system_info(build_type) of
-        lcnt ->
+    case catch erlang:system_info(lock_counting) of
+        true ->
             do_smoke_lcnt(Config);
         _ ->
             {skip,"Lock counting is not enabled"}
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index 2f6fe1c732..02da4f4ace 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -36,7 +36,7 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [make_all, make_files, recompile_on_changed_include,
+    [make_all, make_files, load, netload, recompile_on_changed_include,
      emake_opts, {group, otp_6057}].
 
 groups() -> 
@@ -55,6 +55,21 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     otp_6057_end(Config).
 
+init_per_testcase(_,Config) ->
+    Config.
+
+end_per_testcase(netload,_Config) ->
+    %% Stop slave - in case of failure
+    Nodes = nodes(),
+    case [N || N <- Nodes,
+               "make_SUITE_netload" == hd(string:lexemes(atom_to_list(N),"@"))] of
+        [Node] ->
+            ct_slave:stop(Node);
+        _ ->
+            ok
+    end;
+end_per_testcase(_,_Config) ->
+    ok.
 
 test_files() -> ["test1", "test2", "test3", "test4"].
 
@@ -83,6 +98,32 @@ make_files(Config) when is_list(Config) ->
     ensure_no_messages(),
     ok.
 
+load(Config) ->
+    Current = prepare_data_dir(Config),
+    code:purge(test1),
+    code:delete(test1),
+    false = code:is_loaded(test1),
+    up_to_date = make:files([test1], [load]),
+    {file,_} = code:is_loaded(test1),
+    file:set_cwd(Current),
+    ensure_no_messages(),
+    ok.
+
+netload(Config) ->
+    Current = prepare_data_dir(Config),
+    code:purge(test1),
+    code:delete(test1),
+    false = code:is_loaded(test1),
+    {ok,Node} = ct_slave:start(make_SUITE_netload),
+    up_to_date = make:files([test1], [netload]),
+    timer:sleep(1000), % async, so give some time
+    {file,F} = code:is_loaded(test1),
+    {file,F} = rpc:call(Node,code,is_loaded,[test1]),
+    ct_slave:stop(Node),
+    file:set_cwd(Current),
+    ensure_no_messages(),
+    ok.
+
 recompile_on_changed_include(Config) ->
     Current = prepare_data_dir(Config),
 
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index 057449d4a2..379a5c09ab 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -50,7 +50,8 @@
 
 -export([analyze/1, basic/1, md/1, q/1, variables/1, unused_locals/1]).
 
--export([format_error/1, otp_7423/1, otp_7831/1, otp_10192/1, otp_13708/1]).
+-export([format_error/1, otp_7423/1, otp_7831/1, otp_10192/1, otp_13708/1,
+         otp_14464/1]).
 
 -import(lists, [append/2, flatten/1, keysearch/3, member/2, sort/1, usort/1]).
 
@@ -81,8 +82,10 @@ groups() ->
        update, deprecated, trycatch, fun_mfa,
        fun_mfa_r14, fun_mfa_vars, qlc]},
      {analyses, [],
+
       [analyze, basic, md, q, variables, unused_locals]},
-     {misc, [], [format_error, otp_7423, otp_7831, otp_10192, otp_13708]}].
+     {misc, [], [format_error, otp_7423, otp_7831, otp_10192, otp_13708,
+                 otp_14464]}].
 
 
 init_per_suite(Conf) when is_list(Conf) ->
@@ -2396,7 +2399,6 @@ otp_10192(Conf) when is_list(Conf) ->
     xref:stop(s),
     ok.
 
-%% OTP-10192. Allow filenames with character codes greater than 126.
 otp_13708(Conf) when is_list(Conf) ->
     {ok, _} = start(s),
     ok = xref:set_default(s, [{verbose, true}]),
@@ -2409,6 +2411,36 @@ otp_13708(Conf) when is_list(Conf) ->
     ok = xref:set_library_path(s, [Dir], [{verbose, true}]),
     xref:stop(s).
 
+%% OTP-14464. Unicode atoms.
+otp_14464(Conf) when is_list(Conf) ->
+    Dir = ?copydir,
+
+    File1 = fname(Dir, "a.erl"),
+    MFile1 = fname(Dir, "a"),
+    Beam1 = fname(Dir, "a.beam"),
+    Test1 = "-module(a).
+             -export([ärlig/0, 'кlирилли́ческий атомB'/0]).
+
+              ärlig() ->
+                  'кlирилли́ческий атомB'.
+
+              'кlирилли́ческий атомB'() ->
+                  foo.
+             ",
+    ok = file:write_file(File1, unicode:characters_to_binary(Test1)),
+    {ok, a} = compile:file(File1, [debug_info,{outdir,Dir}]),
+
+    {ok, _} = xref:start(s),
+    {ok, a} = xref:add_module(s, MFile1),
+
+    {ok, [{a,ärlig,0}]} = xref:q(s, 'a:"ärlig"/0'),
+    {ok, [{a,'кlирилли́ческий атомB',0}]} =
+        xref:q(s, 'a:"кlирилли́ческий атомB"/0'),
+
+    xref:stop(s),
+    ok = file:delete(File1),
+    ok = file:delete(Beam1).
+
 %%%
 %%% Utilities
 %%%