diff options
author | Siri Hansen <[email protected]> | 2014-06-12 09:17:24 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2014-06-12 09:17:24 +0200 |
commit | 227793da80034f76e546b5cba240a31b26287d2b (patch) | |
tree | 4738c18009a008a62c6809bdf546e883fe2148e7 /lib/common_test/src/ct_framework.erl | |
parent | da42410cb15c0749ea6cf9b6196b81320d8391b6 (diff) | |
parent | 7274a9db9b17cc14fde15a3aa0574136c58e8551 (diff) | |
download | otp-227793da80034f76e546b5cba240a31b26287d2b.tar.gz otp-227793da80034f76e546b5cba240a31b26287d2b.tar.bz2 otp-227793da80034f76e546b5cba240a31b26287d2b.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_framework.erl')
-rw-r--r-- | lib/common_test/src/ct_framework.erl | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index 20903607dc..e8ea7992b4 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -1244,38 +1244,7 @@ report(What,Data) -> ct_logs:make_all_suites_index({TestName,RunDir}), ok; tests_start -> - case ct_util:get_testdata(cover) of - undefined -> - ok; - {_CovFile,_CovNodes,CovImport,CovExport,_CovAppData} -> - %% Always import cover data from files specified by CovImport - %% if no CovExport defined. If CovExport is defined, only - %% import from CovImport files initially, then use CovExport - %% to pass coverdata between proceeding tests (in the same run). - Imps = - case CovExport of - [] -> % don't export data between tests - CovImport; - _ -> - case filelib:is_file(CovExport) of - true -> - [CovExport]; - false -> - CovImport - end - end, - lists:foreach( - fun(Imp) -> - case cover:import(Imp) of - ok -> - ok; - {error,Reason} -> - ct_logs:log("COVER INFO", - "Importing cover data from: ~ts fails! " - "Reason: ~p", [Imp,Reason]) - end - end, Imps) - end; + ok; tests_done -> ok; severe_error -> |