[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Fix install-info tests on mingw
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Fix install-info tests on mingw |
|
Date: |
Sun, 23 Oct 2022 12:10:49 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new b508d98d46 Fix install-info tests on mingw
b508d98d46 is described below
commit b508d98d4686780e75509c09830dfc1572204c78
Author: Bruno Haible <bruno@clisp.org>
AuthorDate: Sun Oct 23 17:10:38 2022 +0100
Fix install-info tests on mingw
* install-info/tests/defs.in [mingw]: Set diff to
'diff --strip-trailing-cr'.
* install-info/tests: Use ${diff} in all tests.
---
ChangeLog | 8 ++++++++
install-info/tests/defs.in | 5 +++++
install-info/tests/ii-0001-test | 2 +-
install-info/tests/ii-0002-test | 2 +-
install-info/tests/ii-0003-test | 2 +-
install-info/tests/ii-0004-test | 2 +-
install-info/tests/ii-0005-test | 2 +-
install-info/tests/ii-0006-test | 2 +-
install-info/tests/ii-0007-test | 2 +-
install-info/tests/ii-0008-test | 2 +-
install-info/tests/ii-0009-test | 2 +-
install-info/tests/ii-0010-test | 2 +-
install-info/tests/ii-0011-test | 2 +-
install-info/tests/ii-0012-test | 2 +-
install-info/tests/ii-0013-test | 2 +-
install-info/tests/ii-0014-test | 2 +-
install-info/tests/ii-0015-test | 2 +-
install-info/tests/ii-0016-test | 2 +-
install-info/tests/ii-0017-test | 2 +-
install-info/tests/ii-0018-test | 2 +-
install-info/tests/ii-0019-test | 2 +-
install-info/tests/ii-0020-test | 2 +-
install-info/tests/ii-0021-test | 2 +-
install-info/tests/ii-0022-test | 2 +-
install-info/tests/ii-0023-test | 2 +-
install-info/tests/ii-0024-test | 2 +-
install-info/tests/ii-0025-test | 2 +-
install-info/tests/ii-0026-test | 2 +-
install-info/tests/ii-0027-test | 2 +-
install-info/tests/ii-0028-test | 2 +-
install-info/tests/ii-0029-test | 2 +-
install-info/tests/ii-0030-test | 2 +-
install-info/tests/ii-0031-test | 2 +-
install-info/tests/ii-0032-test | 2 +-
install-info/tests/ii-0033-test | 2 +-
install-info/tests/ii-0034-test | 2 +-
install-info/tests/ii-0035-test | 2 +-
install-info/tests/ii-0036-test | 2 +-
install-info/tests/ii-0037-test | 2 +-
install-info/tests/ii-0038-test | 2 +-
install-info/tests/ii-0039-test | 2 +-
install-info/tests/ii-0040-test | 2 +-
install-info/tests/ii-0041-test | 2 +-
install-info/tests/ii-0042-test | 2 +-
install-info/tests/ii-0043-test | 2 +-
install-info/tests/ii-0044-test | 2 +-
install-info/tests/ii-0045-test | 2 +-
install-info/tests/ii-0046-test | 2 +-
install-info/tests/ii-0047-test | 2 +-
install-info/tests/ii-0048-test | 2 +-
install-info/tests/ii-0049-test | 2 +-
install-info/tests/ii-0050-test | 2 +-
install-info/tests/ii-0051-test | 2 +-
install-info/tests/ii-0052-test | 2 +-
install-info/tests/ii-0053-test | 2 +-
install-info/tests/ii-0054-test | 2 +-
install-info/tests/ii-0055-test | 2 +-
install-info/tests/ii-0056-test | 2 +-
install-info/tests/ii-0057-test | 2 +-
59 files changed, 70 insertions(+), 57 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d0d49c6f4b..6afa4ec116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-10-23 Bruno Haible <bruno@clisp.org>
+
+ Fix install-info tests on mingw
+
+ * install-info/tests/defs.in [mingw]: Set diff to
+ 'diff --strip-trailing-cr'.
+ * install-info/tests: Use ${diff} in all tests.
+
2022-10-23 Gavin Smith <gavinsmith0123@gmail.com>
Avoid calling Perl version of 'free'
diff --git a/install-info/tests/defs.in b/install-info/tests/defs.in
index cf372ce4c2..1349b23a27 100644
--- a/install-info/tests/defs.in
+++ b/install-info/tests/defs.in
@@ -72,6 +72,11 @@ else
path_sep=":"
fi
+diff=diff
+if echo '@host_os@' | $EGREP 'mingw' >/dev/null; then
+ diff='diff --strip-trailing-cr'
+fi
+
# Return true if PROG is somewhere in PATH, else false.
findprog ()
{
diff --git a/install-info/tests/ii-0001-test b/install-info/tests/ii-0001-test
index efa2d2855b..92c3322a9f 100755
--- a/install-info/tests/ii-0001-test
+++ b/install-info/tests/ii-0001-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0001-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0001-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0002-test b/install-info/tests/ii-0002-test
index e80b24a672..c62f8696b6 100755
--- a/install-info/tests/ii-0002-test
+++ b/install-info/tests/ii-0002-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0002-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0002-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0003-test b/install-info/tests/ii-0003-test
index 3be04858f1..fc45751ad0 100755
--- a/install-info/tests/ii-0003-test
+++ b/install-info/tests/ii-0003-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0003-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0003-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0004-test b/install-info/tests/ii-0004-test
index cd992d97cd..4c359ce36c 100755
--- a/install-info/tests/ii-0004-test
+++ b/install-info/tests/ii-0004-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0004-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0004-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0005-test b/install-info/tests/ii-0005-test
index a1f76ec715..50da9b3422 100755
--- a/install-info/tests/ii-0005-test
+++ b/install-info/tests/ii-0005-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0005-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0005-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0006-test b/install-info/tests/ii-0006-test
index dba5102263..a677c53924 100755
--- a/install-info/tests/ii-0006-test
+++ b/install-info/tests/ii-0006-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0006-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0006-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0007-test b/install-info/tests/ii-0007-test
index bc2609f557..186fe9188f 100755
--- a/install-info/tests/ii-0007-test
+++ b/install-info/tests/ii-0007-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0007-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0007-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0008-test b/install-info/tests/ii-0008-test
index 6d4f78fdce..4072b9e427 100755
--- a/install-info/tests/ii-0008-test
+++ b/install-info/tests/ii-0008-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0008-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0008-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0009-test b/install-info/tests/ii-0009-test
index 335746b244..3f3059335e 100755
--- a/install-info/tests/ii-0009-test
+++ b/install-info/tests/ii-0009-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0009-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0009-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0010-test b/install-info/tests/ii-0010-test
index f879a5317b..c43ee8198d 100755
--- a/install-info/tests/ii-0010-test
+++ b/install-info/tests/ii-0010-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0010-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0010-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0011-test b/install-info/tests/ii-0011-test
index f568afd29c..3c4944b9aa 100755
--- a/install-info/tests/ii-0011-test
+++ b/install-info/tests/ii-0011-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0011-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0011-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0012-test b/install-info/tests/ii-0012-test
index 4e0209aee6..53f976d7de 100755
--- a/install-info/tests/ii-0012-test
+++ b/install-info/tests/ii-0012-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0012-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0012-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0013-test b/install-info/tests/ii-0013-test
index 0dd8ace3ce..772a8a8290 100755
--- a/install-info/tests/ii-0013-test
+++ b/install-info/tests/ii-0013-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0013-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0013-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0014-test b/install-info/tests/ii-0014-test
index 9d5520ef03..5c6ee31e3d 100755
--- a/install-info/tests/ii-0014-test
+++ b/install-info/tests/ii-0014-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0014-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0014-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0015-test b/install-info/tests/ii-0015-test
index ae8a998252..386342e800 100755
--- a/install-info/tests/ii-0015-test
+++ b/install-info/tests/ii-0015-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0015-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0015-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0016-test b/install-info/tests/ii-0016-test
index a8d6b4e77a..3fdc11db1a 100755
--- a/install-info/tests/ii-0016-test
+++ b/install-info/tests/ii-0016-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0016-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0016-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0017-test b/install-info/tests/ii-0017-test
index 29a04cdb7a..7e5fb6e992 100755
--- a/install-info/tests/ii-0017-test
+++ b/install-info/tests/ii-0017-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0017-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0017-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0018-test b/install-info/tests/ii-0018-test
index 4ca62f3099..efa60b6228 100755
--- a/install-info/tests/ii-0018-test
+++ b/install-info/tests/ii-0018-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0018-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0018-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0019-test b/install-info/tests/ii-0019-test
index 77b649727f..a0d5b94dd5 100755
--- a/install-info/tests/ii-0019-test
+++ b/install-info/tests/ii-0019-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0019-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0019-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0020-test b/install-info/tests/ii-0020-test
index ba5c444919..c567075e9e 100755
--- a/install-info/tests/ii-0020-test
+++ b/install-info/tests/ii-0020-test
@@ -20,7 +20,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0020-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0020-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0021-test b/install-info/tests/ii-0021-test
index 41310ee86f..1e8ae975ef 100755
--- a/install-info/tests/ii-0021-test
+++ b/install-info/tests/ii-0021-test
@@ -20,7 +20,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0021-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0021-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0022-test b/install-info/tests/ii-0022-test
index 84eaf7720f..eabe573ce4 100755
--- a/install-info/tests/ii-0022-test
+++ b/install-info/tests/ii-0022-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0022-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0022-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0023-test b/install-info/tests/ii-0023-test
index 306f5cc420..42223f5796 100755
--- a/install-info/tests/ii-0023-test
+++ b/install-info/tests/ii-0023-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0023-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0023-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0024-test b/install-info/tests/ii-0024-test
index 7cea1b08bd..ba02fc4b57 100755
--- a/install-info/tests/ii-0024-test
+++ b/install-info/tests/ii-0024-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0024-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0024-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0025-test b/install-info/tests/ii-0025-test
index 8db932113e..b5998aac5c 100755
--- a/install-info/tests/ii-0025-test
+++ b/install-info/tests/ii-0025-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0025-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0025-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0026-test b/install-info/tests/ii-0026-test
index b62c8c722c..8091e12a59 100755
--- a/install-info/tests/ii-0026-test
+++ b/install-info/tests/ii-0026-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0026-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0026-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0027-test b/install-info/tests/ii-0027-test
index 2fe9a4c294..84886280e1 100755
--- a/install-info/tests/ii-0027-test
+++ b/install-info/tests/ii-0027-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0027-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0027-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0028-test b/install-info/tests/ii-0028-test
index 473d26ccc8..51860f256f 100755
--- a/install-info/tests/ii-0028-test
+++ b/install-info/tests/ii-0028-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0028-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0028-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0029-test b/install-info/tests/ii-0029-test
index 57df1078c0..0eb7055f8f 100755
--- a/install-info/tests/ii-0029-test
+++ b/install-info/tests/ii-0029-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0029-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0029-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0030-test b/install-info/tests/ii-0030-test
index 84ab4f85e3..8856bf88ed 100755
--- a/install-info/tests/ii-0030-test
+++ b/install-info/tests/ii-0030-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0030-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0030-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0031-test b/install-info/tests/ii-0031-test
index 0a451993a3..ac27d0f063 100755
--- a/install-info/tests/ii-0031-test
+++ b/install-info/tests/ii-0031-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0031-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0031-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0032-test b/install-info/tests/ii-0032-test
index 2ed6c3f039..cacc2a3c3f 100755
--- a/install-info/tests/ii-0032-test
+++ b/install-info/tests/ii-0032-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0032-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0032-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0033-test b/install-info/tests/ii-0033-test
index aa89feddec..93f769e21a 100755
--- a/install-info/tests/ii-0033-test
+++ b/install-info/tests/ii-0033-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0033-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0033-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0034-test b/install-info/tests/ii-0034-test
index 1df0f2adcf..d0a5fcd1cc 100755
--- a/install-info/tests/ii-0034-test
+++ b/install-info/tests/ii-0034-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0034-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0034-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0035-test b/install-info/tests/ii-0035-test
index 7e9142abcf..3e26e70ad5 100755
--- a/install-info/tests/ii-0035-test
+++ b/install-info/tests/ii-0035-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0035-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0035-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0036-test b/install-info/tests/ii-0036-test
index 2fa062c901..2ba5b9fbd4 100755
--- a/install-info/tests/ii-0036-test
+++ b/install-info/tests/ii-0036-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0036-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0036-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0037-test b/install-info/tests/ii-0037-test
index 4a1991d90a..4b401a4960 100755
--- a/install-info/tests/ii-0037-test
+++ b/install-info/tests/ii-0037-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0037-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0037-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0038-test b/install-info/tests/ii-0038-test
index 121b72cf9b..6c8cc45ea8 100755
--- a/install-info/tests/ii-0038-test
+++ b/install-info/tests/ii-0038-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0038-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0038-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0039-test b/install-info/tests/ii-0039-test
index c32c892652..2d74db6fef 100755
--- a/install-info/tests/ii-0039-test
+++ b/install-info/tests/ii-0039-test
@@ -22,7 +22,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0039-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0039-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0040-test b/install-info/tests/ii-0040-test
index 4a45e816a6..bad43ebf8d 100755
--- a/install-info/tests/ii-0040-test
+++ b/install-info/tests/ii-0040-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0040-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0040-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0041-test b/install-info/tests/ii-0041-test
index b9f164c6ad..c55b40a574 100755
--- a/install-info/tests/ii-0041-test
+++ b/install-info/tests/ii-0041-test
@@ -27,7 +27,7 @@ if cmp $expectedfile $outputdirfile >/dev/null; then
else
if gzip -d -c < $expectedfile > $expectedfile_uncompressed; then
if gzip -d -c < $outputdirfile > $outputdirfile_uncompressed; then
- diff $expectedfile_uncompressed $outputdirfile_uncompressed
+ ${diff} $expectedfile_uncompressed $outputdirfile_uncompressed
retval=$?
else
# $outputdirfile is not in gzip format
diff --git a/install-info/tests/ii-0042-test b/install-info/tests/ii-0042-test
index cf49025b7d..003b0da687 100755
--- a/install-info/tests/ii-0042-test
+++ b/install-info/tests/ii-0042-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0042-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0042-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0043-test b/install-info/tests/ii-0043-test
index bc95997749..09465456b6 100755
--- a/install-info/tests/ii-0043-test
+++ b/install-info/tests/ii-0043-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0043-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0043-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0044-test b/install-info/tests/ii-0044-test
index 0ab156808a..10eb2fb371 100755
--- a/install-info/tests/ii-0044-test
+++ b/install-info/tests/ii-0044-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0044-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0044-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0045-test b/install-info/tests/ii-0045-test
index 8c9d874d43..221f540f70 100755
--- a/install-info/tests/ii-0045-test
+++ b/install-info/tests/ii-0045-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0045-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0045-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0046-test b/install-info/tests/ii-0046-test
index a0e604d45a..6e7aa1e5a1 100755
--- a/install-info/tests/ii-0046-test
+++ b/install-info/tests/ii-0046-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0046-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0046-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0047-test b/install-info/tests/ii-0047-test
index bb5a1587af..1b9da91833 100755
--- a/install-info/tests/ii-0047-test
+++ b/install-info/tests/ii-0047-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0047-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0047-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0048-test b/install-info/tests/ii-0048-test
index 45602cc4b1..2282b21706 100755
--- a/install-info/tests/ii-0048-test
+++ b/install-info/tests/ii-0048-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0048-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0048-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0049-test b/install-info/tests/ii-0049-test
index 086d579ad9..6957cdb784 100755
--- a/install-info/tests/ii-0049-test
+++ b/install-info/tests/ii-0049-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0049-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0049-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0050-test b/install-info/tests/ii-0050-test
index 2bcafd9b8a..9fb54cf168 100755
--- a/install-info/tests/ii-0050-test
+++ b/install-info/tests/ii-0050-test
@@ -28,7 +28,7 @@ if cmp $expectedfile $outputdirfile >/dev/null; then
else
if gzip -d -c < $expectedfile > $expectedfile_uncompressed; then
if gzip -d -c < $outputdirfile > $outputdirfile_uncompressed; then
- diff $expectedfile_uncompressed $outputdirfile_uncompressed
+ ${diff} $expectedfile_uncompressed $outputdirfile_uncompressed
retval=$?
else
# $outputdirfile is not in gzip format
diff --git a/install-info/tests/ii-0051-test b/install-info/tests/ii-0051-test
index e46f010da7..58eb164364 100755
--- a/install-info/tests/ii-0051-test
+++ b/install-info/tests/ii-0051-test
@@ -23,7 +23,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0051-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0051-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0052-test b/install-info/tests/ii-0052-test
index bd5f9a2e5f..02ae882499 100755
--- a/install-info/tests/ii-0052-test
+++ b/install-info/tests/ii-0052-test
@@ -23,7 +23,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-diff ${testdir}/ii-0052-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0052-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0053-test b/install-info/tests/ii-0053-test
index e3daf3118d..8bf181e503 100755
--- a/install-info/tests/ii-0053-test
+++ b/install-info/tests/ii-0053-test
@@ -17,7 +17,7 @@ test $? = 0 || exit 1
${install_info} ${testdir}/ii-0053-input-info-file $outputdirfile
test $? = 0 || exit 2
-diff ${testdir}/ii-0053-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0053-expected-dir-file $outputdirfile
test $? = 0 || exit 3
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0054-test b/install-info/tests/ii-0054-test
index 7524d1206b..a2254608e8 100755
--- a/install-info/tests/ii-0054-test
+++ b/install-info/tests/ii-0054-test
@@ -18,7 +18,7 @@ info_with_space='ii54 input.info.gz'
cp ${testdir}/ii-0054-input-info-file.gz "$info_with_space"
${install_info} "$info_with_space" $outputdirfile || exit $?
-diff ${testdir}/ii-0054-expected-dir-file $outputdirfile || exit $?
+${diff} ${testdir}/ii-0054-expected-dir-file $outputdirfile || exit $?
rm -f "$info_with_space" $outputdirfile
exit $retval
diff --git a/install-info/tests/ii-0055-test b/install-info/tests/ii-0055-test
index d343980c68..b12c6c4bf0 100755
--- a/install-info/tests/ii-0055-test
+++ b/install-info/tests/ii-0055-test
@@ -21,7 +21,7 @@ ${install_info} \
${testdir}/ii-$testnum-input-info-file $outputdirfile \
|| exit $?
-diff ${testdir}/ii-$testnum-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-$testnum-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0056-test b/install-info/tests/ii-0056-test
index aab8ff5d8a..eec0e0d27f 100755
--- a/install-info/tests/ii-0056-test
+++ b/install-info/tests/ii-0056-test
@@ -21,7 +21,7 @@ ${install_info} \
${testdir}/ii-$testnum-input-info-file $outputdirfile \
|| exit $?
-diff ${testdir}/ii-$testnum-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-$testnum-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0057-test b/install-info/tests/ii-0057-test
index cb30000ace..d27d532dc1 100755
--- a/install-info/tests/ii-0057-test
+++ b/install-info/tests/ii-0057-test
@@ -20,7 +20,7 @@ ${install_info} \
${testdir}/ii-$testnum-input-info-file $outputdirfile \
|| exit $?
-diff ${testdir}/ii-$testnum-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-$testnum-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Fix install-info tests on mingw,
Gavin D. Smith <=