svn commit: r321142 - in stable/11: contrib/atf/atf-c libexec/atf/atf-sh
Ngie Cooper
ngie at FreeBSD.org
Tue Jul 18 17:51:48 UTC 2017
Author: ngie
Date: Tue Jul 18 17:51:46 2017
New Revision: 321142
URL: https://svnweb.freebsd.org/changeset/base/321142
Log:
MFC r316552,r319662:
r316552:
atf-c: fix documentation description for atf_utils_wait(3)
atf_utils_wait(3) should be used in combination with atf_utils_fork(3),
not itself (atf_utils_wait(3)).
r319662:
Add MLINKS for atf-sh(3) to each of the functions it implements
This hopefully will make atf-sh(3) easier to understand for newcomers,
without having to go through the atf-sh(3) level of indirection.
Modified:
stable/11/contrib/atf/atf-c/atf-c.3
stable/11/libexec/atf/atf-sh/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/atf/atf-c/atf-c.3
==============================================================================
--- stable/11/contrib/atf/atf-c/atf-c.3 Tue Jul 18 17:51:33 2017 (r321141)
+++ stable/11/contrib/atf/atf-c/atf-c.3 Tue Jul 18 17:51:46 2017 (r321142)
@@ -22,7 +22,7 @@
.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.Dd March 6, 2017
+.Dd April 5, 2017
.Dt ATF-C 3
.Os
.Sh NAME
@@ -680,7 +680,7 @@ those spawned by
.Fc
.Bd -ragged -offset indent
Waits and validates the result of a subprocess spawned with
-.Fn atf_utils_wait .
+.Fn atf_utils_fork .
The validation involves checking that the subprocess exited cleanly and returned
the code specified in
.Fa expected_exit_status
Modified: stable/11/libexec/atf/atf-sh/Makefile
==============================================================================
--- stable/11/libexec/atf/atf-sh/Makefile Tue Jul 18 17:51:33 2017 (r321141)
+++ stable/11/libexec/atf/atf-sh/Makefile Tue Jul 18 17:51:46 2017 (r321142)
@@ -34,7 +34,29 @@ ATF= ${SRCTOP}/contrib/atf
PROG_CXX= atf-sh
SRCS= atf-sh.cpp
MAN= atf-sh.1 atf-sh.3
-MLINKS+= atf-sh.3 atf-sh-api.3 # Backwards compatibility.
+# Backwards compatibility.
+MLINKS+= atf-sh.3 atf-sh-api.3
+
+MLINKS+= \
+ atf-sh.3 atf_add_test_case.3 \
+ atf-sh.3 atf_check.3 \
+ atf-sh.3 atf_check_equal.3 \
+ atf-sh.3 atf_config_get.3 \
+ atf-sh.3 atf_config_has.3 \
+ atf-sh.3 atf_expect_death.3 \
+ atf-sh.3 atf_expect_exit.3 \
+ atf-sh.3 atf_expect_fail.3 \
+ atf-sh.3 atf_expect_pass.3 \
+ atf-sh.3 atf_expect_signal.3 \
+ atf-sh.3 atf_expect_timeout.3 \
+ atf-sh.3 atf_fail.3 \
+ atf-sh.3 atf_get.3 \
+ atf-sh.3 atf_get_srcdir.3 \
+ atf-sh.3 atf_pass.3 \
+ atf-sh.3 atf_require_prog.3 \
+ atf-sh.3 atf_set.3 \
+ atf-sh.3 atf_skip.3 \
+ atf-sh.3 atf_test_case.3
CFLAGS+= -DHAVE_CONFIG_H
CFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"'
More information about the svn-src-all
mailing list