aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/Makefile
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-11-20 12:30:53 +0100
committerPeter Andersson <[email protected]>2012-11-20 12:30:53 +0100
commitef8c1a9b7d0e9f35439fcb1e75e2e287cba53e9a (patch)
treedfef1a69c45f9684fcde45ffed8c8b315006ce5e /lib/common_test/test/Makefile
parent3618f75a8816e119a1ed9c7ff71664f0d49f5fb7 (diff)
parentb0acd41f90490d38156cf9c8615859def630596b (diff)
downloadotp-ef8c1a9b7d0e9f35439fcb1e75e2e287cba53e9a.tar.gz
otp-ef8c1a9b7d0e9f35439fcb1e75e2e287cba53e9a.tar.bz2
otp-ef8c1a9b7d0e9f35439fcb1e75e2e287cba53e9a.zip
Merge branch 'maint'
Conflicts: lib/common_test/test/Makefile
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 3de33688da..df816f9a61 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -55,7 +55,8 @@ MODULES= \
ct_system_error_SUITE \
ct_snmp_SUITE \
ct_group_leader_SUITE \
- ct_cover_SUITE
+ ct_cover_SUITE \
+ ct_groups_search_SUITE
ERL_FILES= $(MODULES:%=%.erl)