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/doc/src | |
| 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/doc/src')
| -rw-r--r-- | lib/common_test/doc/src/Makefile | 7 | ||||
| -rw-r--r-- | lib/common_test/doc/src/ref_man.xml | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile index 2ec6952710..99161ce68a 100644 --- a/lib/common_test/doc/src/Makefile +++ b/lib/common_test/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2003-2011. All Rights Reserved. +# Copyright Ericsson AB 2003-2012. 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 @@ -46,7 +46,8 @@ CT_MODULES = \ ct_rpc \ ct_snmp \ unix_telnet \ - ct_slave + ct_slave \ + ct_netconfc CT_XML_FILES = $(CT_MODULES:=.xml) @@ -123,7 +124,7 @@ $(HTMLDIR)/%.gif: %.gif docs: pdf html man -$(CT_XML_FILES): +$(CT_XML_FILES): %.xml: ../../src/%.erl escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -preprocess true -i $(XMERL_DIR)/include \ -i ../../../test_server/include -i ../../include \ -i ../../../../erts/lib/kernel/include -i ../../../../lib/kernel/include \ diff --git a/lib/common_test/doc/src/ref_man.xml b/lib/common_test/doc/src/ref_man.xml index a9fdef7359..6fede88434 100644 --- a/lib/common_test/doc/src/ref_man.xml +++ b/lib/common_test/doc/src/ref_man.xml @@ -4,7 +4,7 @@ <application xmlns:xi="http://www.w3.org/2001/XInclude"> <header> <copyright> - <year>2003</year><year>2011</year> + <year>2003</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -71,6 +71,7 @@ <xi:include href="ct_cover.xml"/> <xi:include href="ct_ftp.xml"/> <xi:include href="ct_ssh.xml"/> + <xi:include href="ct_netconfc.xml"/> <xi:include href="ct_rpc.xml"/> <xi:include href="ct_snmp.xml"/> <xi:include href="ct_telnet.xml"/> |