diff options
| author | Peter Andersson <[email protected]> | 2016-06-07 11:04:18 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-06-07 11:04:18 +0200 |
| commit | 3d5e91fada367fee723563fe133a45cc81dd3a73 (patch) | |
| tree | 1c6237876b2722a1e835db01ebf7e8dde6488efd | |
| parent | f204d0dd77fa261bf2b99a7aa0b6a2413f0ef533 (diff) | |
| download | otp-3d5e91fada367fee723563fe133a45cc81dd3a73.tar.gz otp-3d5e91fada367fee723563fe133a45cc81dd3a73.tar.bz2 otp-3d5e91fada367fee723563fe133a45cc81dd3a73.zip | |
Make sure test node shuts down before skipping suite
| -rw-r--r-- | lib/common_test/test/ct_repeat_testrun_SUITE.erl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE.erl index 195abdb7c0..f8b6a379f6 100644 --- a/lib/common_test/test/ct_repeat_testrun_SUITE.erl +++ b/lib/common_test/test/ct_repeat_testrun_SUITE.erl @@ -85,19 +85,21 @@ init_per_suite(Config0) -> %% Check if file i/o is too slow for correct measurements Opts3 = Opts0 ++ [{suite,Suite1},{testcase,tc1},{label,timing3}], - {T,{1,0,{0,0}}} = - timer:tc(fun() -> - ct_test_support:run(ct,run_test, - [Opts3],Config), - ct_test_support:run(ct,run_test, - [Opts3],Config) - end), + {T,_} = + timer:tc( + fun() -> + {1,0,{0,0}} = ct_test_support:run(ct,run_test, + [Opts3],Config), + {1,0,{0,0}} = ct_test_support:run(ct,run_test, + [Opts3],Config) + end), %% The time to compare with here must match the timeout value %% in the test suite. Accept 30% logging overhead (26 sec total). if T > 26000000 -> ct:pal("Timing test took ~w sec (< 27 sec expected). " "Skipping the suite!", [trunc(T/1000000)]), + ct_test_support:end_per_suite(Config), {skip,"File I/O too slow for this suite"}; true -> ct:pal("Timing test took ~w sec. Proceeding...", |