aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/Makefile
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-08-17 11:40:48 +0200
committerSiri Hansen <[email protected]>2012-08-17 11:40:48 +0200
commitf11a10e75d7f3b49a58ac225d624ac6654e23870 (patch)
treec4ee2b182adab901a2f3f8aec29e6b1badd2fcca /lib/common_test/test/Makefile
parent9125e9158a7547e51c94276aec6b98e9424c0c68 (diff)
parentbc8f2b83132c30f88699b555cc7ffb79d8018ac2 (diff)
downloadotp-f11a10e75d7f3b49a58ac225d624ac6654e23870.tar.gz
otp-f11a10e75d7f3b49a58ac225d624ac6654e23870.tar.bz2
otp-f11a10e75d7f3b49a58ac225d624ac6654e23870.zip
Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maint
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Move ct_netconfc_SUITE into datadir and run with ct_test_support [common_test] Don't abort test if opening of connection fails [common_test] Don't allow named (required) connection to be opened twice [common_test] Don't abort test run if connection process crashes [common_test] Add netconf client, ct_netconfc
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 560a0b0d5a..4d85b84b5b 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -45,7 +45,8 @@ MODULES= \
ct_config_SUITE \
ct_master_SUITE \
ct_misc_1_SUITE \
- ct_hooks_SUITE
+ ct_hooks_SUITE \
+ ct_netconfc_SUITE
ERL_FILES= $(MODULES:%=%.erl)