diff options
| author | Hans Bolinder <[email protected]> | 2013-03-19 09:46:33 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-03-19 09:46:33 +0100 |
| commit | e3bd19e7cde34070f60a83e180279040284b0034 (patch) | |
| tree | c0930c875741df9c1c4f46b88507b11b70cfda96 /lib/kernel | |
| parent | 0c713345472e69bc1b31e81306e5e2c6dd061653 (diff) | |
| parent | ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0 (diff) | |
| download | otp-e3bd19e7cde34070f60a83e180279040284b0034.tar.gz otp-e3bd19e7cde34070f60a83e180279040284b0034.tar.bz2 otp-e3bd19e7cde34070f60a83e180279040284b0034.zip | |
Merge branch 'maint'
* maint:
Fix a test case
Fix a test case
Fix a test case bug
Fix a test case bug
Remove ?line from dets_SUITE.erl
Adjust dets.erl to cope with an evil test case
Correct a disk_log testcase
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/test/disk_log_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/kernel/test/interactive_shell_SUITE.erl | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl index 0f811b8f73..f55af1e354 100644 --- a/lib/kernel/test/disk_log_SUITE.erl +++ b/lib/kernel/test/disk_log_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2012. All Rights Reserved. +%% Copyright Ericsson AB 1997-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -3205,7 +3205,7 @@ many_users(Conf) when is_list(Conf) -> ?line true = lists:duplicate(NoClients, {error, {full,"log.LOG"}}) == C2, ?line true = length(T2) > 0, ?line {C3, T3} = many(Fun2, NoClients, N, wrap, internal, - {300*NoClients,20}, Dir), + {300*NoClients,200}, Dir), ?line true = lists:duplicate(NoClients, ok) == C3, ?line true = length(T3) == N*NoClients, ok. diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl index 36e13cec26..dac021c6c6 100644 --- a/lib/kernel/test/interactive_shell_SUITE.erl +++ b/lib/kernel/test/interactive_shell_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2012. All Rights Reserved. +%% Copyright Ericsson AB 2007-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -193,7 +193,7 @@ job_control_remote(Config) when is_list(Config) -> {skip,"No new shell found"}; _ -> ?line RNode = create_nodename(), - ?line MyNode = atom_to_list(node()), + ?line MyNode = atom2list(node()), ?line Pid = spawn_link(fun() -> receive die -> ok @@ -254,7 +254,7 @@ job_control_remote_noshell(Config) when is_list(Config) -> end), ?line PidStr = rpc:call(NSNode,erlang,pid_to_list,[Pid]), ?line true = rpc:call(NSNode,erlang,register,[kalaskula,Pid]), - ?line NSNodeStr = atom_to_list(NSNode), + ?line NSNodeStr = atom2list(NSNode), ?line CookieString = lists:flatten( io_lib:format("~w", [erlang:get_cookie()])), @@ -715,7 +715,10 @@ get_default_shell() -> {putline, "whereis(user_drv)."}, {getline, "undefined"}],[]), old - catch E:R -> - ?dbg({E,R}), + catch _E:_R -> + ?dbg({_E,_R}), new end. + +atom2list(A) -> + lists:flatten(io_lib:format("~w", [A])). |