aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_run.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2016-03-08 15:20:37 +0100
committerPeter Andersson <[email protected]>2016-03-08 15:20:37 +0100
commit08cbad5d41cc4a2616ba3294145bedf02b239a9b (patch)
tree53c6a5c3d62c6d2a49e627915ab28c1dc9f0ec6c /lib/common_test/src/ct_run.erl
parent043133b500274669fa8b5b894939280185941ce3 (diff)
parent660726c4f6854cdda8c06101f0ed488e7625a89e (diff)
downloadotp-08cbad5d41cc4a2616ba3294145bedf02b239a9b.tar.gz
otp-08cbad5d41cc4a2616ba3294145bedf02b239a9b.tar.bz2
otp-08cbad5d41cc4a2616ba3294145bedf02b239a9b.zip
Merge branch 'peppe/common_test/rm_unwanted_tests' into maint
* peppe/common_test/rm_unwanted_tests: Fix remaining issues Enable execution of multiple test cases or groups from a test spec term OTP-13241
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
-rw-r--r--lib/common_test/src/ct_run.erl7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index b4364b87ff..ceb94ceee5 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -2055,6 +2055,13 @@ final_tests1([{TestDir,Suite,GrsOrCs}|Tests], Final, Skip, Bad) when
({skipped,Group,TCs}) ->
[ct_groups:make_conf(TestDir, Suite,
Group, [skipped], TCs)];
+ ({skipped,TC}) ->
+ case lists:member(TC, GrsOrCs) of
+ true ->
+ [];
+ false ->
+ [TC]
+ end;
({GrSpec = {GroupName,_},TCs}) ->
Props = [{override,GrSpec}],
[ct_groups:make_conf(TestDir, Suite,