[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: build: Fix failure of all install-info tests on S
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: build: Fix failure of all install-info tests on Solaris 11.4. |
|
Date: |
Tue, 20 Aug 2024 12:26:14 -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 3ee3d649ec build: Fix failure of all install-info tests on Solaris
11.4.
3ee3d649ec is described below
commit 3ee3d649ec91d7f81ecac1a58d3c535efe846a2d
Author: Bruno Haible <bruno@clisp.org>
AuthorDate: Tue Aug 20 17:20:45 2024 +0100
build: Fix failure of all install-info tests on Solaris 11.4.
* install-info/tests/defs.in (DIFF_OPTIONS): New variable.
(diff): Remove variable.
* install-info/tests/ii-*-test: Use diff $DIFF_OPTIONS instead
of ${diff}.
---
ChangeLog | 9 +++++++++
install-info/tests/defs.in | 2 +-
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 +-
install-info/tests/ii-0058-test | 2 +-
install-info/tests/ii-0059-test | 2 +-
install-info/tests/ii-0060-test | 2 +-
62 files changed, 70 insertions(+), 61 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9fd7e0894a..2b2925a561 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-08-20 Bruno Haible <bruno@clisp.org>
+
+ build: Fix failure of all install-info tests on Solaris 11.4.
+
+ * install-info/tests/defs.in (DIFF_OPTIONS): New variable.
+ (diff): Remove variable.
+ * install-info/tests/ii-*-test: Use diff $DIFF_OPTIONS instead
+ of ${diff}.
+
2024-08-18 Gavin Smith <gavinsmith0123@gmail.com>
Check for diff --strip-trailing-cr.
diff --git a/install-info/tests/defs.in b/install-info/tests/defs.in
index 0424313566..30e70c08b2 100644
--- a/install-info/tests/defs.in
+++ b/install-info/tests/defs.in
@@ -72,7 +72,7 @@ else
path_sep=":"
fi
-diff="diff @DIFF_OPTIONS@"
+DIFF_OPTIONS="@DIFF_OPTIONS@"
# 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 92c3322a9f..ba75a94132 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 $DIFF_OPTIONS ${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 c62f8696b6..3539ad8f54 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 $DIFF_OPTIONS ${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 fc45751ad0..7cab485266 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 $DIFF_OPTIONS ${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 4c359ce36c..f7483568fc 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 $DIFF_OPTIONS ${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 50da9b3422..d48abb5186 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 $DIFF_OPTIONS ${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 a677c53924..2e49ca1157 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 $DIFF_OPTIONS ${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 186fe9188f..beefd15043 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 $DIFF_OPTIONS ${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 4072b9e427..7364f6d14a 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 $DIFF_OPTIONS ${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 3f3059335e..f83969fc65 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 $DIFF_OPTIONS ${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 c43ee8198d..e1b833f36a 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 $DIFF_OPTIONS ${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 3c4944b9aa..2b693f1ec6 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 $DIFF_OPTIONS ${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 53f976d7de..8dfe6aedeb 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 $DIFF_OPTIONS ${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 772a8a8290..0fbe7cc0a5 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 $DIFF_OPTIONS ${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 5c6ee31e3d..3ad7639b8b 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 $DIFF_OPTIONS ${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 386342e800..e409db15f7 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 $DIFF_OPTIONS ${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 3fdc11db1a..de4ffb013e 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 $DIFF_OPTIONS ${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 7e5fb6e992..b051dd75cc 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 $DIFF_OPTIONS ${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 efa60b6228..d480e71dc1 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 $DIFF_OPTIONS ${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 a0d5b94dd5..3b29cd1127 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 $DIFF_OPTIONS ${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 c567075e9e..0251e224e1 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 $DIFF_OPTIONS ${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 1e8ae975ef..c56344fffc 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 $DIFF_OPTIONS ${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 eabe573ce4..3cd602e76e 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 $DIFF_OPTIONS ${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 42223f5796..d7b0ab6a87 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 $DIFF_OPTIONS ${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 ba02fc4b57..7a9cfb35c4 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 $DIFF_OPTIONS ${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 b5998aac5c..8bfc84d44c 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 $DIFF_OPTIONS ${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 8091e12a59..941a66b032 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 $DIFF_OPTIONS ${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 84886280e1..b2578741ed 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 $DIFF_OPTIONS ${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 51860f256f..8edf73f5af 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 $DIFF_OPTIONS ${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 0eb7055f8f..516a2fb651 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 $DIFF_OPTIONS ${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 8856bf88ed..4077d0f619 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 $DIFF_OPTIONS ${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 ac27d0f063..7f2f6a595e 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 $DIFF_OPTIONS ${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 cacc2a3c3f..cd4c0ecaed 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 $DIFF_OPTIONS ${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 93f769e21a..81eecdd3cf 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 $DIFF_OPTIONS ${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 d0a5fcd1cc..fd680cb18b 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 $DIFF_OPTIONS ${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 3e26e70ad5..cea76e7353 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 $DIFF_OPTIONS ${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 2ba5b9fbd4..2bbbce3b0b 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 $DIFF_OPTIONS ${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 4b401a4960..be64ae1196 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 $DIFF_OPTIONS ${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 6c8cc45ea8..19e8500224 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 $DIFF_OPTIONS ${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 2d74db6fef..bad281b1dc 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 $DIFF_OPTIONS ${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 bad43ebf8d..653572b11a 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 $DIFF_OPTIONS ${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 c55b40a574..8ddc8fc32c 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 $DIFF_OPTIONS $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 003b0da687..230e50fd39 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 $DIFF_OPTIONS ${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 09465456b6..5468baa28a 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 $DIFF_OPTIONS ${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 10eb2fb371..24b21f4d59 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 $DIFF_OPTIONS ${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 221f540f70..55701ec6db 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 $DIFF_OPTIONS ${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 6e7aa1e5a1..98b66e2449 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 $DIFF_OPTIONS ${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 1b9da91833..fe49655bc8 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 $DIFF_OPTIONS ${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 2282b21706..1754d58939 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 $DIFF_OPTIONS ${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 6957cdb784..c0fd6c0b42 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 $DIFF_OPTIONS ${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 9fb54cf168..1af5dc1dc9 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 $DIFF_OPTIONS $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 58eb164364..e37fd908eb 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 $DIFF_OPTIONS ${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 02ae882499..33d3661cd5 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 $DIFF_OPTIONS ${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 8bf181e503..41806001d8 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 $DIFF_OPTIONS ${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 a2254608e8..8792a03007 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 $DIFF_OPTIONS ${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 b12c6c4bf0..43979aab3f 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 $DIFF_OPTIONS ${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 eec0e0d27f..bdf9dff344 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 $DIFF_OPTIONS ${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 d27d532dc1..f98e806805 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 $DIFF_OPTIONS ${testdir}/ii-$testnum-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0058-test b/install-info/tests/ii-0058-test
index 1f800262c7..7f832d5569 100755
--- a/install-info/tests/ii-0058-test
+++ b/install-info/tests/ii-0058-test
@@ -45,7 +45,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-${diff} ${testdir}/ii-0058-expected-dir-file $outputdirfile
+diff $DIFF_OPTIONS ${testdir}/ii-0058-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0059-test b/install-info/tests/ii-0059-test
index c30e3fe89b..1c43962579 100755
--- a/install-info/tests/ii-0059-test
+++ b/install-info/tests/ii-0059-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-${diff} ${testdir}/ii-0059-expected-dir-file $outputdirfile
+diff $DIFF_OPTIONS ${testdir}/ii-0059-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff --git a/install-info/tests/ii-0060-test b/install-info/tests/ii-0060-test
index 5f06aef0d8..2d4e3396b6 100755
--- a/install-info/tests/ii-0060-test
+++ b/install-info/tests/ii-0060-test
@@ -21,7 +21,7 @@ if [ "x$retval" != "x0" ]; then
exit $retval
fi
-${diff} ${testdir}/ii-0060-expected-dir-file $outputdirfile
+diff $DIFF_OPTIONS ${testdir}/ii-0060-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: build: Fix failure of all install-info tests on Solaris 11.4.,
Gavin D. Smith <=