diff options
| author | Patrik Nyblom <[email protected]> | 2010-11-26 14:13:25 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-11-30 16:36:07 +0100 |
| commit | 0c18c4ba3f561ae6d9ff943863bfc62e5e9099e1 (patch) | |
| tree | 82d01fc5680c25ccc1f6f966e343c35b743fb4d5 /lib/kernel | |
| parent | 15f5143f0d7c2bde33e1d3e38e622943d555d415 (diff) | |
| download | otp-0c18c4ba3f561ae6d9ff943863bfc62e5e9099e1.tar.gz otp-0c18c4ba3f561ae6d9ff943863bfc62e5e9099e1.tar.bz2 otp-0c18c4ba3f561ae6d9ff943863bfc62e5e9099e1.zip | |
Corrected testcases broken by unicode filenames
Also corrected type-info for bifs
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/src/code.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/test/code_SUITE.erl | 18 | ||||
| -rw-r--r-- | lib/kernel/test/os_SUITE.erl | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl index ec256d5806..d37b74bc03 100644 --- a/lib/kernel/src/code.erl +++ b/lib/kernel/src/code.erl @@ -286,6 +286,8 @@ do_start(Flags) -> ets:module_info(module), os:module_info(module), + binary:module_info(module), + unicode:module_info(module), filename:module_info(module), lists:module_info(module), diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl index 6f846ebc56..0c7440a13e 100644 --- a/lib/kernel/test/code_SUITE.erl +++ b/lib/kernel/test/code_SUITE.erl @@ -645,7 +645,7 @@ analyse([], [This={M,F,A}|Path], Visited, ErrCnt0) -> %% These modules should be loaded by code.erl before %% the code_server is started. OK = [erlang, os, prim_file, erl_prim_loader, init, ets, - code_server, lists, lists_sort, filename, packages, + code_server, lists, lists_sort, unicode, binary, filename, packages, gb_sets, gb_trees, hipe_unified_loader, hipe_bifs, prim_zip, zlib], ErrCnt1 = @@ -674,6 +674,22 @@ analyse2(MFA={_,_,_}, Path, Visited0) -> %%%% We need to check these manually... % fun's are ok as long as they are defined locally. check_funs({'$M_EXPR','$F_EXPR',_}, + [{unicode,characters_to_binary_int,3}, + {unicode,characters_to_binary,3}, + {filename,filename_string_to_binary,1}|_]) -> 0; +check_funs({'$M_EXPR','$F_EXPR',_}, + [{unicode,ml_map,3}, + {unicode,characters_to_binary_int,3}, + {unicode,characters_to_binary,3}, + {filename,filename_string_to_binary,1}|_]) -> 0; +check_funs({'$M_EXPR','$F_EXPR',_}, + [{unicode,do_o_binary2,2}, + {unicode,do_o_binary,2}, + {unicode,o_trans,1}, + {unicode,characters_to_binary_int,3}, + {unicode,characters_to_binary,3}, + {filename,filename_string_to_binary,1}|_]) -> 0; +check_funs({'$M_EXPR','$F_EXPR',_}, [{code_server,load_native_code,4}, {code_server,load_native_code_1,2}, {code_server,load_native_code,2}, diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl index ace9501d18..eacf3c7584 100644 --- a/lib/kernel/test/os_SUITE.erl +++ b/lib/kernel/test/os_SUITE.erl @@ -204,8 +204,9 @@ evil(Config) when is_list(Config) -> evil_loop(Parent, ?EVIL_LOOPS,N) end) end, lists:seq(1, ?EVIL_PROCS)), - Devil = spawn(fun () -> devil(hd(Ps), hd(lists:reverse(Ps))) end), + Devil = spawn_link(fun () -> devil(hd(Ps), hd(lists:reverse(Ps))) end), lists:foreach(fun (P) -> receive {P, done} -> ok end end, Ps), + unlink(Devil), exit(Devil, kill), test_server:timetrap_cancel(Dog), ok. |