diff options
author | Erlang/OTP <[email protected]> | 2009-12-14 13:03:38 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2009-12-14 13:03:38 +0000 |
commit | 1540714225f1d224ebeac73c711d673984edcf51 (patch) | |
tree | 01fe9e9d01700b815614a048a2a79efed6ec1ac2 /lib/kernel/test/code_SUITE_data/on_load/on_load_b.erl | |
parent | 47b882a585b5a226bd00b5125bac948ba9268c7f (diff) | |
parent | 1fe894432615e35f4ecbe3a33f8ba2ded21f8096 (diff) | |
download | otp-1540714225f1d224ebeac73c711d673984edcf51.tar.gz otp-1540714225f1d224ebeac73c711d673984edcf51.tar.bz2 otp-1540714225f1d224ebeac73c711d673984edcf51.zip |
Merge branch 'bg/on_load' into ccase/r13b04_dev
* bg/on_load:
Test on_load functions that don't return 'ok'
Change the expected return value for on_load functions
OTP-8339 The expected return value for an on_load function has been
changed. (See the section about code loading in the Reference
manual.)
Diffstat (limited to 'lib/kernel/test/code_SUITE_data/on_load/on_load_b.erl')
-rw-r--r-- | lib/kernel/test/code_SUITE_data/on_load/on_load_b.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/test/code_SUITE_data/on_load/on_load_b.erl b/lib/kernel/test/code_SUITE_data/on_load/on_load_b.erl index 5c4d676e2d..947cbd5bcd 100644 --- a/lib/kernel/test/code_SUITE_data/on_load/on_load_b.erl +++ b/lib/kernel/test/code_SUITE_data/on_load/on_load_b.erl @@ -6,7 +6,7 @@ on_load() -> ?MASTER ! {?MODULE,start}, on_load_c:data(), ?MASTER ! {?MODULE,done}, - true. + ok. data() -> [b|on_load_c:data()]. |