diff options
| author | Henrik Nord <[email protected]> | 2012-07-18 11:04:02 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-07-18 11:04:02 +0200 |
| commit | 154c00482d134260190127040ac6b4efb9f85a8f (patch) | |
| tree | 9c09386fda97663f98a4bb5a5840df3d58f0b05f /lib/kernel/test | |
| parent | f82a553307c865440a01ff38e9b9d6482fe55550 (diff) | |
| parent | 7875e98fcac4a45607a99ba08a421206a7cf1586 (diff) | |
| download | otp-154c00482d134260190127040ac6b4efb9f85a8f.tar.gz otp-154c00482d134260190127040ac6b4efb9f85a8f.tar.bz2 otp-154c00482d134260190127040ac6b4efb9f85a8f.zip | |
Merge branch 'ta/prim_archive-reloading' into maint
* ta/prim_archive-reloading:
escript_SUITE: remove gratuitous space
[erts,kernel,stdlib] fix escript/primary archive reloading
Conflicts:
erts/preloaded/src/erl_prim_loader.erl
OTP-10151
Diffstat (limited to 'lib/kernel/test')
| -rw-r--r-- | lib/kernel/test/erl_prim_loader_SUITE.erl | 8 |
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. |