[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog install-info/tests/defs.in
From: |
karl |
Subject: |
texinfo ChangeLog install-info/tests/defs.in |
Date: |
Fri, 30 Nov 2012 18:08:12 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: karl <karl> 12/11/30 18:08:11
Modified files:
. : ChangeLog
install-info/tests: defs.in
Log message:
minimal replacement for mktemp if not found
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1463&r2=1.1464
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/tests/defs.in?cvsroot=texinfo&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1463
retrieving revision 1.1464
diff -u -b -r1.1463 -r1.1464
--- ChangeLog 28 Nov 2012 17:37:23 -0000 1.1463
+++ ChangeLog 30 Nov 2012 18:08:11 -0000 1.1464
@@ -1,3 +1,9 @@
+2012-11-30 Karl Berry <address@hidden>
+
+ * install-info/tests/defs.in (mktemp): define minimal
+ replacement if not found in PATH. It is lacking on AIX 6 (Ineiev)
+ and mingw (Eli).
+
2012-11-28 Karl Berry <address@hidden>
* install-info/tests/defs.in (path_spec, EGREP): need these
Index: install-info/tests/defs.in
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/tests/defs.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- install-info/tests/defs.in 28 Nov 2012 17:37:23 -0000 1.4
+++ install-info/tests/defs.in 30 Nov 2012 18:08:11 -0000 1.5
@@ -1,5 +1,5 @@
# @configure_input@
-# $Id: defs.in,v 1.4 2012/11/28 17:37:23 karl Exp $
+# $Id: defs.in,v 1.5 2012/11/30 18:08:11 karl Exp $
#
# Copyright 2008, 2012 Free Software Foundation, Inc.
#
@@ -26,7 +26,7 @@
# Ensure we are running from the right directory.
if test ! -f ./defs; then
- echo "defs: not found in current directory" 1>&2
+ echo "$0: defs: not found in current directory." 1>&2
exit 1
fi
@@ -38,6 +38,15 @@
test $srcdir = $0 && srcdir=.
fi
+# Two variables we use in the test scripts:
address@hidden@
+install_info=${top_builddir}/install-info/ginstall-info
+export install_info
+#
address@hidden@
+testdir=${top_srcdir}/install-info/tests
+export testdir
+
# In case someone pedantic insists on using grep -E.
: ${EGREP=egrep}
@@ -75,13 +84,18 @@
return 1
}
-
-# Two variables we use in the test scripts.
-
address@hidden@
-install_info=${top_builddir}/install-info/ginstall-info
-export install_info
-
address@hidden@
-testdir=${top_srcdir}/install-info/tests
-export testdir
+if findprog mktemp; then :; else
+# Some deficient proprietary systems lack mktemp; kowtow to them.
+# Our mktemp substitute doesn't need all the features of real mktemp;
+# our tests here only use it in the most simplistic way, to create a
+# temp file. The autoconf manual suggests doing it in a temporary
+# directory (mode 700). ($RANDOM may expand to nothing, but that's ok.)
+# We do not even bother to expand the X's in the template ...
+mktemp ()
+{
+ dir=$TMPDIR/iimktemp$$-$RANDOM
+ (umask 077 && mkdir "$dir")
+ touch "$dir/$1" || return 1
+ echo "$dir/$1"
+}
+fi