2 files changed, 45 insertions, 5 deletions
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index 2e48b11740..146c915087 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -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),