aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/Makefile
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-06-11 15:07:43 +0200
committerSiri Hansen <[email protected]>2014-06-11 15:07:43 +0200
commit7274a9db9b17cc14fde15a3aa0574136c58e8551 (patch)
tree784af5ebfb48de90041e82569d94fbf4964b670c /lib/common_test/test/Makefile
parentfed8c2586a80c79951f994f24ba69c30bd8d262c (diff)
parent5a3c4668908254ee930c8db2e5cf9741945f9b2b (diff)
downloadotp-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/common_test/test/Makefile')
-rw-r--r--lib/common_test/test/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 085f19d023..a0ac47f12a 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2008-2013. All Rights Reserved.
+# Copyright Ericsson AB 2008-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
@@ -61,6 +61,7 @@ MODULES= \
ct_snmp_SUITE \
ct_group_leader_SUITE \
ct_cover_SUITE \
+ ct_cover_nomerge_SUITE \
ct_groups_search_SUITE \
ct_surefire_SUITE \
ct_telnet_SUITE