[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6155] skip interactive info tests if we can't build pseudotty
From: |
Gavin D. Smith |
Subject: |
[6155] skip interactive info tests if we can't build pseudotty |
Date: |
Wed, 25 Feb 2015 19:55:43 +0000 |
Revision: 6155
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6155
Author: gavin
Date: 2015-02-25 19:55:42 +0000 (Wed, 25 Feb 2015)
Log Message:
-----------
skip interactive info tests if we can't build pseudotty
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
trunk/info/Makefile.am
trunk/info/t/Init-inter.inc
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-02-25 19:29:16 UTC (rev 6154)
+++ trunk/ChangeLog 2015-02-25 19:55:42 UTC (rev 6155)
@@ -1,5 +1,13 @@
2015-02-25 Gavin Smith <address@hidden>
+ * configure.ac: Check for posix_openpt in AC_CHECK_FUNCS, and
+ set automake conditional "have_ptys" depending on result.
+ * info/Makefile.am (check_PROGRAMS): Build of "pseudotty"
+ dependent upon "have_ptys".
+ * info/t/Init-inter.inc: Skip test if pseudotty not built.
+
+2015-02-25 Gavin Smith <address@hidden>
+
* info/man.c (get_manpage_from_formatter)
[PIPE_USE_FORK, !PIPE_USE_FORK]: If exit status of "man" command
is non-zero, throw away its output. Report from Eli Zaretskii.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2015-02-25 19:29:16 UTC (rev 6154)
+++ trunk/configure.ac 2015-02-25 19:55:42 UTC (rev 6155)
@@ -167,9 +167,12 @@
# that anyone compiling new texinfo still has such a thing? we'll see.
# AC_FUNC_SETVBUF_REVERSED
AC_CHECK_FUNCS(bzero getcwd memset setlocale setvbuf sigaction sigprocmask \
- sigsetmask strchr)
+ sigsetmask strchr posix_openpt)
AC_REPLACE_FUNCS(memcpy memmove strdup strerror)
+# Used for Info tests
+AM_CONDITIONAL([have_ptys], [test x$ac_cv_func_posix_openpt = xyes])
+
# We want to recognize djgpp to avoid the useless warning about no
# term library.
AC_CANONICAL_BUILD
Modified: trunk/info/Makefile.am
===================================================================
--- trunk/info/Makefile.am 2015-02-25 19:29:16 UTC (rev 6154)
+++ trunk/info/Makefile.am 2015-02-25 19:55:42 UTC (rev 6155)
@@ -78,8 +78,10 @@
# Test suite
+if have_ptys
check_PROGRAMS = pseudotty
pseudotty_SOURCES = pseudotty.c
+endif
TESTS = \
t/file.sh \
Modified: trunk/info/t/Init-inter.inc
===================================================================
--- trunk/info/t/Init-inter.inc 2015-02-25 19:29:16 UTC (rev 6154)
+++ trunk/info/t/Init-inter.inc 2015-02-25 19:55:42 UTC (rev 6155)
@@ -16,6 +16,9 @@
# Initialize test of interactive operation
# This file is to be sourced, not run directly
+# Skip test if pseudotty wasn't built
+test -x pseudotty || exit 77
+
# we may look up whether a couple of utilities exist.
# Systems which define $COMSPEC or $ComSpec use semicolons to separate
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6155] skip interactive info tests if we can't build pseudotty,
Gavin D. Smith <=