diff options
| author | Micael Karlberg <[email protected]> | 2011-11-04 12:35:30 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-04 12:35:30 +0100 |
| commit | d93329a709fe4f9fc4bc3cfdc80027d247bd3e55 (patch) | |
| tree | 1f93063a81a5417beda05385143406e29dc4deed /lib/megaco/test/megaco_test_lib.erl | |
| parent | 82e41d4b3a57774a23a57d345637a0e19e8727d0 (diff) | |
| parent | 887c163802c7c39decd727240cd307964a1d692b (diff) | |
| download | otp-d93329a709fe4f9fc4bc3cfdc80027d247bd3e55.tar.gz otp-d93329a709fe4f9fc4bc3cfdc80027d247bd3e55.tar.bz2 otp-d93329a709fe4f9fc4bc3cfdc80027d247bd3e55.zip | |
The profiling test tool has been rewritten.
H�kan Mattsson.
OTP-9679
Merge branch 'bmk/megaco/improving_profiling_tool/OTP-9679' into bmk/megaco/r15_integration
Diffstat (limited to 'lib/megaco/test/megaco_test_lib.erl')
| -rw-r--r-- | lib/megaco/test/megaco_test_lib.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl index 41f6c2c4cb..282fd91b44 100644 --- a/lib/megaco/test/megaco_test_lib.erl +++ b/lib/megaco/test/megaco_test_lib.erl @@ -21,6 +21,7 @@ %%---------------------------------------------------------------------- %% Purpose: Lightweight test server %%---------------------------------------------------------------------- +%% -module(megaco_test_lib). @@ -684,7 +685,7 @@ skip(Actual, File, Line) -> fatal_skip(Actual, File, Line) -> error(Actual, File, Line), - exit(shutdown). + exit({skipped, {fatal, Actual, File, Line}}). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -749,6 +750,7 @@ proxy_loop(OwnId, Controller) -> proxy_loop(OwnId, Controller) end. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Test server callbacks init_per_testcase(_Case, Config) -> @@ -852,10 +854,10 @@ watchdog(Pid, Time) -> prepare_test_case(Actions, N, Config, File, Line) -> OrigNodes = lookup_config(nodes, Config), TestNodes = lookup_config(nodenames, Config), %% For testserver - This = node(), + This = node(), SomeNodes = OrigNodes ++ (TestNodes -- OrigNodes), - AllNodes = [This | (SomeNodes -- [This])], - Nodes = pick_n_nodes(N, AllNodes, File, Line), + AllNodes = [This | (SomeNodes -- [This])], + Nodes = pick_n_nodes(N, AllNodes, File, Line), start_nodes(Nodes, File, Line), do_prepare_test_case(Actions, Nodes, Config, File, Line). |