diff options
| author | Dan Gudmundsson <[email protected]> | 2014-03-28 10:05:23 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-03-28 10:05:23 +0100 |
| commit | 95ffe7eb374f59ce3f289747212adf042c1cd703 (patch) | |
| tree | 5752dddb7ff2d9eb4d914402b396f226c5c2d964 /lib/os_mon/test/cpu_sup_SUITE.erl | |
| parent | 5b9ffc724e7c3ffe7c775b5113de059e2e25f755 (diff) | |
| parent | 4f63cca949982e88d958e33e2e278b18da4de4b3 (diff) | |
| download | otp-95ffe7eb374f59ce3f289747212adf042c1cd703.tar.gz otp-95ffe7eb374f59ce3f289747212adf042c1cd703.tar.bz2 otp-95ffe7eb374f59ce3f289747212adf042c1cd703.zip | |
Merge branch 'dgud/testcasecuddling'
* dgud/testcasecuddling:
os_mon: test tweaks
kernel: tweak tests
mnesia: test harder sync
mnesia: Dialyzer fixes
stdlib: loosen testcases
wx: loosen testcase
Diffstat (limited to 'lib/os_mon/test/cpu_sup_SUITE.erl')
| -rw-r--r-- | lib/os_mon/test/cpu_sup_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl index e0382cb0c7..9f58e043db 100644 --- a/lib/os_mon/test/cpu_sup_SUITE.erl +++ b/lib/os_mon/test/cpu_sup_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2011. All Rights Reserved. +%% Copyright Ericsson AB 2002-2014. 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 @@ -257,8 +257,8 @@ port(Config) when is_list(Config) -> terminate(suite) -> []; terminate(Config) when is_list(Config) -> - ?line ok = application:set_env(os_mon, start_cpu_sup, false), - ?line ok = supervisor:terminate_child(os_mon_sup, cpu_sup), + ok = application:set_env(os_mon, start_cpu_sup, false), + _ = supervisor:terminate_child(os_mon_sup, cpu_sup), ok. unavailable(suite) -> |