diff options
| author | Siri Hansen <[email protected]> | 2014-06-11 15:07:43 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-06-11 15:07:43 +0200 |
| commit | 7274a9db9b17cc14fde15a3aa0574136c58e8551 (patch) | |
| tree | 784af5ebfb48de90041e82569d94fbf4964b670c /lib/test_server/src/ts.erl | |
| parent | fed8c2586a80c79951f994f24ba69c30bd8d262c (diff) | |
| parent | 5a3c4668908254ee930c8db2e5cf9741945f9b2b (diff) | |
| download | otp-7274a9db9b17cc14fde15a3aa0574136c58e8551.tar.gz otp-7274a9db9b17cc14fde15a3aa0574136c58e8551.tar.bz2 otp-7274a9db9b17cc14fde15a3aa0574136c58e8551.zip | |
Merge branch 'siri/ct-and-cover/OTP-11971' into maint
* siri/ct-and-cover/OTP-11971:
Improve cover analysis via common_test
Change internal format of CoverInfo in test_server
[ct] Add test of cover support when merge_tests=false
Diffstat (limited to 'lib/test_server/src/ts.erl')
| -rw-r--r-- | lib/test_server/src/ts.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl index bc7d244c7c..d6d2e865e2 100644 --- a/lib/test_server/src/ts.erl +++ b/lib/test_server/src/ts.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2013. All Rights Reserved. +%% Copyright Ericsson AB 1997-2014. 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 @@ -641,16 +641,17 @@ get_last_app_tests([Dir|Dirs],RE,Acc) -> NewAcc = case re:run(Dir,RE,[{capture,all,list}]) of {match,[Dir,AppStr]} -> + Dir1 = filename:dirname(Dir), % cover logs in ct_run.<t> dir App = list_to_atom(AppStr), case lists:keytake(App,1,Acc) of {value,{App,LastDir},Rest} -> - if Dir > LastDir -> - [{App,Dir}|Rest]; + if Dir1 > LastDir -> + [{App,Dir1}|Rest]; true -> Acc end; false -> - [{App,Dir} | Acc] + [{App,Dir1} | Acc] end; _ -> Acc |