diff options
| author | Siri Hansen <[email protected]> | 2012-08-17 11:40:48 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-08-17 11:40:48 +0200 |
| commit | f11a10e75d7f3b49a58ac225d624ac6654e23870 (patch) | |
| tree | c4ee2b182adab901a2f3f8aec29e6b1badd2fcca /lib/common_test/src/Makefile | |
| parent | 9125e9158a7547e51c94276aec6b98e9424c0c68 (diff) | |
| parent | bc8f2b83132c30f88699b555cc7ffb79d8018ac2 (diff) | |
| download | otp-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/src/Makefile')
| -rw-r--r-- | lib/common_test/src/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile index 037a686963..f7dce195d7 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile @@ -70,14 +70,18 @@ MODULES= \ ct_hooks\ ct_hooks_lock\ cth_log_redirect\ - cth_surefire + cth_surefire \ + ct_netconfc \ + ct_conn_log_h \ + cth_conn_log TARGET_MODULES= $(MODULES:%=$(EBIN)/%) BEAM_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) ERL_FILES= $(MODULES:=.erl) HRL_FILES = \ - ct_util.hrl + ct_util.hrl \ + ct_netconfc.hrl EXTERNAL_HRL_FILES = \ ../include/ct.hrl \ ../include/ct_event.hrl |