diff options
author | Lukas Larsson <lukas@erix.ericsson.se> | 2011-02-28 17:42:08 +0100 |
---|---|---|
committer | Lukas Larsson <lukas@erix.ericsson.se> | 2011-02-28 17:42:08 +0100 |
commit | 98d3b0c86ff3d99a4d175291df54c5ed48357fce (patch) | |
tree | cee479a155511bd89c152ab8035145373d970d08 /lib/common_test/src/ct_util.hrl | |
parent | e4dca28b4dc0397d2fc37d9853452f5abc9c4211 (diff) | |
parent | d66d7ad951d89e5af7f10c171dd1c7a848990273 (diff) | |
download | otp-98d3b0c86ff3d99a4d175291df54c5ed48357fce.tar.gz otp-98d3b0c86ff3d99a4d175291df54c5ed48357fce.tar.bz2 otp-98d3b0c86ff3d99a4d175291df54c5ed48357fce.zip |
Merge branch 'lukas/common_test/test_order_wrong/OTP-9026' into dev
* lukas/common_test/test_order_wrong/OTP-9026:
Add test event info for the old tests
Update test spec parser to not group suites, groups and cases which are hierarchically related if merge_tests config i set to false
Add test cases for test spec ordering of testcases in spec
Conflicts:
lib/common_test/test/ct_testspec_1_SUITE.erl
Diffstat (limited to 'lib/common_test/src/ct_util.hrl')
-rw-r--r-- | lib/common_test/src/ct_util.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl index 4ed29bdcd1..f0255c533c 100644 --- a/lib/common_test/src/ct_util.hrl +++ b/lib/common_test/src/ct_util.hrl @@ -41,7 +41,8 @@ multiply_timetraps=[], scale_timetraps=[], alias=[], - tests=[]}). + tests=[], + merge_tests = true }). -record(cover, {app=none, level=details, |