diff options
author | Erlang/OTP <otp@erlang.org> | 2010-01-31 07:18:55 +0000 |
---|---|---|
committer | Erlang/OTP <otp@erlang.org> | 2010-01-31 08:28:58 +0100 |
commit | 07bf3fd306d7757d378a30dafee10e1adf19f376 (patch) | |
tree | 130b7bec320b702b43eb58c78ee814b15936807a /lib/stdlib/test/timer_SUITE.erl | |
parent | d91db9e12b15a821592aa95de39c47e5ad2923ab (diff) | |
parent | a656a27d520cec163aa99fbec583ba7a30a4f72e (diff) | |
download | otp-07bf3fd306d7757d378a30dafee10e1adf19f376.tar.gz otp-07bf3fd306d7757d378a30dafee10e1adf19f376.tar.bz2 otp-07bf3fd306d7757d378a30dafee10e1adf19f376.zip |
Merge branch 'bg/cleanup-tests' into ccase/r13b04_dev
* bg/cleanup-tests:
file_SUITE: eliminate a warning for an unused variable
kernel tests: modernize guard tests
unicode_SUITE: replace deprecated concat_binary/1 with list_to_binary/1
stdlib tests: modernize guard tests
Test suites: fix creation of Emakefiles
Diffstat (limited to 'lib/stdlib/test/timer_SUITE.erl')
-rw-r--r-- | lib/stdlib/test/timer_SUITE.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/stdlib/test/timer_SUITE.erl b/lib/stdlib/test/timer_SUITE.erl index 86d8612b56..5f38c91c64 100644 --- a/lib/stdlib/test/timer_SUITE.erl +++ b/lib/stdlib/test/timer_SUITE.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 1996-2010. 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 %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% -module(timer_SUITE). @@ -271,7 +271,7 @@ collect(N, {E,A,B}, I) -> print_report -> print_report({E,A,B,I}), collect(N,{E,A,B}, I); - {Pid, get_report} when pid(Pid) -> + {Pid, get_report} when is_pid(Pid) -> Pid ! {report, {E, A, B, I}}, collect(N,{E,A,B}, I); reset -> |