[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog install-info/tests/defs.in in...
From: |
karl |
Subject: |
texinfo ChangeLog install-info/tests/defs.in in... |
Date: |
Sun, 11 Nov 2012 00:33:54 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: karl <karl> 12/11/11 00:33:54
Modified files:
. : ChangeLog
install-info/tests: defs.in ii-0053-test
Log message:
set CDPATH before unsetting (for BSD), avoid one test using -e
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1434&r2=1.1435
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/tests/defs.in?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/tests/ii-0053-test?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1434
retrieving revision 1.1435
diff -u -b -r1.1434 -r1.1435
--- ChangeLog 10 Nov 2012 16:59:02 -0000 1.1434
+++ ChangeLog 11 Nov 2012 00:33:53 -0000 1.1435
@@ -1,8 +1,13 @@
2012-11-10 Karl Berry <address@hidden>
+ * install-info/tests/defs.in: set CDPATH before unsetting,
+ to placate BSD sh. From Stefano.
+ * install-info/tests/ii-0053-test: avoid -e.
+
* configure.ac (AM_INIT_AUTOMAKE): use parallel-tests,
as recommended by Stefano Lattarini. Require automake 1.12.
* build-aux/test-driver: new file to support it.
+ * .cvsignore: ignore *.trs and *.log in test dirs.
2012-11-09 Karl Berry <address@hidden>
Index: install-info/tests/defs.in
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/tests/defs.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- install-info/tests/defs.in 17 Apr 2008 17:54:17 -0000 1.1
+++ install-info/tests/defs.in 11 Nov 2012 00:33:54 -0000 1.2
@@ -1,7 +1,7 @@
# @configure_input@
-# $Id: defs.in,v 1.1 2008/04/17 17:54:17 karl Exp $
+# $Id: defs.in,v 1.2 2012/11/11 00:33:54 karl Exp $
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,8 @@
SHELL='@SHELL@'
export SHELL
-unset CDPATH
+# unsetting an already-unset variable fails with BSD sh.
+CDPATH=; unset CDPATH
# Ensure we are running from the right directory.
if test ! -f ./defs; then
Index: install-info/tests/ii-0053-test
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/tests/ii-0053-test,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- install-info/tests/ii-0053-test 7 Jul 2008 17:59:58 -0000 1.3
+++ install-info/tests/ii-0053-test 11 Nov 2012 00:33:54 -0000 1.4
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
@@ -7,14 +7,18 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-. ./defs
+. ./defs || exit 1
outputdirfile=`mktemp ii53-XXXXXXXX`
cp ${testdir}/ii-0053-input-dir-file $outputdirfile
+test $? = 0 || exit 1
-# Have to handle newlines in input dir entries, too.
+# Test for handling newlines in input dir entries, too.
${install_info} ${testdir}/ii-0053-input-info-file $outputdirfile
+test $? = 0 || exit 2
+
diff ${testdir}/ii-0053-expected-dir-file $outputdirfile
+test $? = 0 || exit 3
rm -f $outputdirfile
exit 0
- texinfo ChangeLog install-info/tests/defs.in in...,
karl <=