aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-01-28 10:17:36 +0100
committerPeter Andersson <[email protected]>2013-01-28 10:17:51 +0100
commitd1b2ad49e74dc78cee737469b467e056a0b07f55 (patch)
tree71c705911392115b7366a37262d33951ddc2ac6b
parentcd14920c2f63a97c7ea32a7726aa3f11cb08b34b (diff)
parent7c57349f0bc2f9766b8051fcb9d9035aafd19758 (diff)
downloadotp-d1b2ad49e74dc78cee737469b467e056a0b07f55.tar.gz
otp-d1b2ad49e74dc78cee737469b467e056a0b07f55.tar.bz2
otp-d1b2ad49e74dc78cee737469b467e056a0b07f55.zip
Merge branch 'peppe/common_test/testspec_include'
* peppe/common_test/testspec_include: Fix failing test case OTP-9881
-rw-r--r--lib/common_test/test/ct_testspec_2_SUITE.erl21
1 files changed, 6 insertions, 15 deletions
diff --git a/lib/common_test/test/ct_testspec_2_SUITE.erl b/lib/common_test/test/ct_testspec_2_SUITE.erl
index ea22312a7d..beaba0eaac 100644
--- a/lib/common_test/test/ct_testspec_2_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_2_SUITE.erl
@@ -500,22 +500,13 @@ multiple_specs(_Config) ->
logdir = [{Node,LogDirV},{Node1,LogDirV},{Node2,LogDirV},"."],
config = CFGs,
tests = [{{Node1,TO1V},
- [{x_SUITE,[all]}]},
- {{Node1,TO1V},
- [{y_SUITE,[{g1,all},{g2,all}]}]},
- {{Node1,TO1V},
- [{y_SUITE,[tc1,tc2]}]},
- {{Node1,TO1V},
- [{z_SUITE,[{all,{skip,"skipped"}}]}]},
- {{Node2,TO2V},
- [{x_SUITE,[all]}]},
- {{Node2,TO2V},
- [{y_SUITE,[all]}]},
- {{Node2,TO2V},
- [{x_SUITE,[{{g1,all},{skip,"skipped"}},
- {{g2,all},{skip,"skipped"}}]}]},
+ [{x_SUITE,[all]},
+ {y_SUITE,[{g1,all},{g2,all},tc1,tc2]},
+ {z_SUITE,[{all,{skip,"skipped"}}]}]},
{{Node2,TO2V},
- [{y_SUITE,[{tc1,{skip,"skipped"}},
+ [{x_SUITE,[all,{{g1,all},{skip,"skipped"}},
+ {{g2,all},{skip,"skipped"}}]},
+ {y_SUITE,[all,{tc1,{skip,"skipped"}},
{tc2,{skip,"skipped"}}]}]}]},
verify_result(Verify,FileResult,FileResult).