aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2012-07-18 11:26:09 +0200
committerHenrik Nord <henrik@erlang.org>2012-07-18 11:26:09 +0200
commit9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390 (patch)
treeef6344901bc1f7c505eab25c3f85840b6229beba /lib/kernel/test
parent0ccc6e476e261b5057ed8d74204c6b52cbdd2605 (diff)
parent95bf75bc27c07bc6a5054fb762cd07335d64b642 (diff)
downloadotp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.tar.gz
otp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.tar.bz2
otp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.zip
Merge branch 'maint'
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam lib/kernel/src/code.erl
Diffstat (limited to 'lib/kernel/test')
-rw-r--r--lib/kernel/test/erl_prim_loader_SUITE.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index 6f4f27d594..72239641e9 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -426,7 +426,9 @@ primary_archive(Config) when is_list(Config) ->
ExpectedEbins = [Archive, DictDir ++ "/ebin", DummyDir ++ "/ebin"],
io:format("ExpectedEbins: ~p\n", [ExpectedEbins]),
?line {ok, FileInfo} = prim_file:read_file_info(Archive),
- ?line {ok, Ebins} = rpc:call(Node, erl_prim_loader, set_primary_archive, [Archive, ArchiveBin, FileInfo]),
+ ?line {ok, Ebins} = rpc:call(Node, erl_prim_loader, set_primary_archive,
+ [Archive, ArchiveBin, FileInfo,
+ fun escript:parse_file/1]),
?line ExpectedEbins = lists:sort(Ebins), % assert
?line {ok, TopFiles2} = rpc:call(Node, erl_prim_loader, list_dir, [Archive]),
@@ -435,7 +437,9 @@ primary_archive(Config) when is_list(Config) ->
?line ok = test_archive(Node, Archive, DictDir, BeamName),
%% Cleanup
- ?line {ok, []} = rpc:call(Node, erl_prim_loader, set_primary_archive, [undefined, undefined, undefined]),
+ ?line {ok, []} = rpc:call(Node, erl_prim_loader, set_primary_archive,
+ [undefined, undefined, undefined,
+ fun escript:parse_file/1]),
?line stop_node(Node),
?line ok = file:delete(Archive),
ok.