diff options
author | Anders Svensson <[email protected]> | 2011-09-27 11:41:52 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2011-09-27 11:41:52 +0200 |
commit | 1c9017d8970713a24a36929063bcc76a28ae54c5 (patch) | |
tree | 5d5020f812501d53da6ef5091ec8a75eebb7918b /lib/diameter/test/diameter_ct.erl | |
parent | 6d31ccf58efcffc53a949fbdd0a217d6c3ac7058 (diff) | |
parent | 162c0d3ee30790ec5a75e20b0e2e8bc61ed92375 (diff) | |
download | otp-1c9017d8970713a24a36929063bcc76a28ae54c5.tar.gz otp-1c9017d8970713a24a36929063bcc76a28ae54c5.tar.bz2 otp-1c9017d8970713a24a36929063bcc76a28ae54c5.zip |
Merge branch 'anders/diameter/testsuites/OTP-9553' into dev
* anders/diameter/testsuites/OTP-9553: (23 commits)
Explicit {init,end}_per_group/2 to work around ct bug
Add relay suite
More traffic cases
Add traffic suite
Use groups for parallel testcase execution
Remove gen_sctp suite since it's not diameter-specific
Minor macro cleanup
Minor diameter_ct simplification
Improve xref testcase
Don't require GNU sed to fail testsuite targets
Generate dependencies makefile
Makefile/spec cleanup
Remove old test framework
Add transport and gen_sctp suites
Add watchdog suite
Add stats suite
Add sync suite
Add reg suite
Add dict suite, remove session suite
Move appup tests into app suite and use systools for both
...
Diffstat (limited to 'lib/diameter/test/diameter_ct.erl')
-rw-r--r-- | lib/diameter/test/diameter_ct.erl | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl new file mode 100644 index 0000000000..f8ee3dc1d7 --- /dev/null +++ b/lib/diameter/test/diameter_ct.erl @@ -0,0 +1,55 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 2010-2011. 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(diameter_ct). + +%% +%% Module used to run suites from Makefile. +%% + +-export([run/1]). + +%% ct:run_test/1 is currently documented as returning a list of test +%% results ... but no. Instead it returns 'ok' regardless of whether +%% or not the suite in question has failed testcases. + +run([Suite]) -> + Start = info(), + ok = ct:run_test([{suite, Suite}, + {logdir, "./log"}, + {auto_compile, false}]), + info(Start , info()). + +info() -> + [{time, now()}, + {process_count, erlang:system_info(process_count)} + | erlang:memory()]. + +info(L0, L1) -> + [T, C | M] + = lists:zipwith(fun({T,N0}, {T,N1}) -> {T, N1, diff(T, N0, N1)} end, + L0, + L1), + Diff = [T, C, {memory, M}], + ct:pal("INFO: ~p~n", [Diff]). + +diff(time, T0, T1) -> + timer:now_diff(T1, T0); +diff(_, N0, N1) -> + N1 - N0. |