diff options
| author | Siri Hansen <[email protected]> | 2013-04-19 10:57:55 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-04-19 10:57:55 +0200 |
| commit | eb325ef3414c7c019eb9541e8d6ab4ce46632e65 (patch) | |
| tree | ed7ae228584fda71d7379106d98827b4164875a1 /lib/sasl | |
| parent | b31b467e902c978284eaeca6a23e336d2301f42a (diff) | |
| parent | afb553a6d776ff751311b950a96b2708a9ee292b (diff) | |
| download | otp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.tar.gz otp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.tar.bz2 otp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[common_test] Adjusted timers in ct_repeat_testrun_SUITE
[common_test] Extend timer in cover_SUITE for slow test host
[sasl] Remove compiler warning in release_handler_SUITE
[common_test] Kill slave nodes after test cases in cover_SUITE
[reltool] Remove erlang:port_close/1 for node port
Diffstat (limited to 'lib/sasl')
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl index 97ba70c9bd..a56924d5ca 100644 --- a/lib/sasl/test/release_handler_SUITE.erl +++ b/lib/sasl/test/release_handler_SUITE.erl @@ -1112,10 +1112,10 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) -> true = rpc:call(Node,erlang,check_old_code,[m10]), %% Run check_install_release with purge before install this time - {TCheck,{ok, _RelVsn1, []}} = + {_TCheck,{ok, _RelVsn1, []}} = timer:tc(rpc,call,[Node, release_handler, check_install_release, [RelVsn2,[purge]]]), -% ct:log("check_install_release with purge: ~.2f",[TCheck/1000000]), +% ct:log("check_install_release with purge: ~.2f",[_TCheck/1000000]), %% Finally install release after check and purge, and check that %% this install was faster than the first. @@ -1209,10 +1209,10 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) -> true = rpc:call(Node,erlang,check_old_code,[m10]), %% Run check_install_release with purge before install this time - {TCheck,{ok, _RelVsn1, []}} = + {_TCheck,{ok, _RelVsn1, []}} = timer:tc(rpc,call,[Node, release_handler, check_install_release, [RelVsn2,[purge]]]), -% ct:log("check_install_release with purge: ~.2f",[TCheck/1000000]), +% ct:log("check_install_release with purge: ~.2f",[_TCheck/1000000]), %% Finally install release after check and purge, and check that %% this install was faster than the first. |