Gavin Smith wrote:
> Could you try a change like the one at the end of this mail?
>
> If that works, then we can make this change throughout the install-info
> test suite.
With the attached patch, all ii-????-test tests pass on mingw.
> The test for mingw may need tweaking to include/exclude MinGW, MSYS,
> cygwin...
Yes, it should test the host platform, not the build platform. I used
echo '@host_os@'
and config.status replaces that with
echo 'mingw32'
Also I removed the 'v' option from the $EGREP command (since we want the
$EGREP command to succeed, not to fail, in the mingw case), and removed
the 'i' option as well (since all config host values are lowercase ASCII
anyway).
> The --strip-trailing-cr option is specific to GNU diff (not in POSIX) but
> it may be ok for mingw.
Yes, the known environments for compiling mingw binaries (mingw, msys2,
cygwin, debian) all have GNU diff in $PATH.
diff -r -u texinfo-6.8.90.orig/install-info/tests/defs.in texinfo-6.8.90/install-info/tests/defs.in
--- texinfo-6.8.90.orig/install-info/tests/defs.in 2022-04-11 21:34:08.000000000 +0200
+++ texinfo-6.8.90/install-info/tests/defs.in 2022-10-23 15:52:28.952453136 +0200
@@ -72,6 +72,11 @@
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 -r -u texinfo-6.8.90.orig/install-info/tests/ii-0001-test texinfo-6.8.90/install-info/tests/ii-0001-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0001-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0001-test 2022-10-23 15:52:53.260287035 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0001-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0001-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0002-test texinfo-6.8.90/install-info/tests/ii-0002-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0002-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0002-test 2022-10-23 15:52:55.996268339 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0002-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0002-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0003-test texinfo-6.8.90/install-info/tests/ii-0003-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0003-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0003-test 2022-10-23 15:52:58.228253087 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0003-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0003-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0004-test texinfo-6.8.90/install-info/tests/ii-0004-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0004-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0004-test 2022-10-23 15:53:00.500237561 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0004-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0004-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0005-test texinfo-6.8.90/install-info/tests/ii-0005-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0005-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0005-test 2022-10-23 15:53:02.828221653 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0005-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0005-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0006-test texinfo-6.8.90/install-info/tests/ii-0006-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0006-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0006-test 2022-10-23 15:53:05.260205034 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0006-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0006-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0007-test texinfo-6.8.90/install-info/tests/ii-0007-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0007-test 2022-02-11 22:56:26.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0007-test 2022-10-23 15:53:07.532189508 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0007-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0007-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0008-test texinfo-6.8.90/install-info/tests/ii-0008-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0008-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0008-test 2022-10-23 15:53:09.820173873 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0008-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0008-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0009-test texinfo-6.8.90/install-info/tests/ii-0009-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0009-test 2022-02-11 22:56:26.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0009-test 2022-10-23 15:53:12.116158183 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0009-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0009-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0010-test texinfo-6.8.90/install-info/tests/ii-0010-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0010-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0010-test 2022-10-23 15:53:14.396142602 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0010-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0010-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0011-test texinfo-6.8.90/install-info/tests/ii-0011-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0011-test 2022-02-11 22:56:26.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0011-test 2022-10-23 15:53:16.780126310 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0011-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0011-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0012-test texinfo-6.8.90/install-info/tests/ii-0012-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0012-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0012-test 2022-10-23 15:53:19.108110402 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0012-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0012-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0013-test texinfo-6.8.90/install-info/tests/ii-0013-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0013-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0013-test 2022-10-23 15:53:21.596093399 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0013-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0013-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0014-test texinfo-6.8.90/install-info/tests/ii-0014-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0014-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0014-test 2022-10-23 15:53:24.036076725 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0014-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0014-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0015-test texinfo-6.8.90/install-info/tests/ii-0015-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0015-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0015-test 2022-10-23 15:53:26.380060706 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0015-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0015-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0016-test texinfo-6.8.90/install-info/tests/ii-0016-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0016-test 2022-02-11 22:56:26.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0016-test 2022-10-23 15:53:28.668045070 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0016-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0016-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0017-test texinfo-6.8.90/install-info/tests/ii-0017-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0017-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0017-test 2022-10-23 15:53:30.980029271 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0017-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0017-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0018-test texinfo-6.8.90/install-info/tests/ii-0018-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0018-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0018-test 2022-10-23 15:53:33.236013853 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0018-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0018-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0019-test texinfo-6.8.90/install-info/tests/ii-0019-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0019-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0019-test 2022-10-23 15:53:35.523998217 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0019-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0019-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0020-test texinfo-6.8.90/install-info/tests/ii-0020-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0020-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0020-test 2022-10-23 15:53:37.811982581 +0200
@@ -20,7 +20,7 @@
exit $retval
fi
-diff ${testdir}/ii-0020-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0020-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0021-test texinfo-6.8.90/install-info/tests/ii-0021-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0021-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0021-test 2022-10-23 15:53:40.091967000 +0200
@@ -20,7 +20,7 @@
exit $retval
fi
-diff ${testdir}/ii-0021-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0021-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0022-test texinfo-6.8.90/install-info/tests/ii-0022-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0022-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0022-test 2022-10-23 15:53:42.523950379 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0022-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0022-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0023-test texinfo-6.8.90/install-info/tests/ii-0023-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0023-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0023-test 2022-10-23 15:53:44.883934251 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0023-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0023-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0024-test texinfo-6.8.90/install-info/tests/ii-0024-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0024-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0024-test 2022-10-23 15:53:47.331917521 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0024-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0024-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0025-test texinfo-6.8.90/install-info/tests/ii-0025-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0025-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0025-test 2022-10-23 15:53:49.867900190 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0025-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0025-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0026-test texinfo-6.8.90/install-info/tests/ii-0026-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0026-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0026-test 2022-10-23 15:53:52.483882312 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0026-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0026-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0027-test texinfo-6.8.90/install-info/tests/ii-0027-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0027-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0027-test 2022-10-23 15:53:55.075864598 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0027-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0027-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0028-test texinfo-6.8.90/install-info/tests/ii-0028-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0028-test 2022-02-11 22:56:26.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0028-test 2022-10-23 15:53:57.627847157 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0028-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0028-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0029-test texinfo-6.8.90/install-info/tests/ii-0029-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0029-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0029-test 2022-10-23 15:54:00.035830700 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0029-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0029-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0030-test texinfo-6.8.90/install-info/tests/ii-0030-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0030-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0030-test 2022-10-23 15:54:02.675812657 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0030-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0030-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0031-test texinfo-6.8.90/install-info/tests/ii-0031-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0031-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0031-test 2022-10-23 15:54:05.947790295 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0031-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0031-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0032-test texinfo-6.8.90/install-info/tests/ii-0032-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0032-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0032-test 2022-10-23 15:54:08.331774002 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0032-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0032-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0033-test texinfo-6.8.90/install-info/tests/ii-0033-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0033-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0033-test 2022-10-23 15:54:10.979755905 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0033-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0033-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0034-test texinfo-6.8.90/install-info/tests/ii-0034-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0034-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0034-test 2022-10-23 15:54:14.267733433 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0034-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0034-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0035-test texinfo-6.8.90/install-info/tests/ii-0035-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0035-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0035-test 2022-10-23 15:54:17.651710306 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0035-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0035-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0036-test texinfo-6.8.90/install-info/tests/ii-0036-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0036-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0036-test 2022-10-23 15:54:20.259692481 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0036-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0036-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0037-test texinfo-6.8.90/install-info/tests/ii-0037-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0037-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0037-test 2022-10-23 15:54:22.763675368 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0037-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0037-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0038-test texinfo-6.8.90/install-info/tests/ii-0038-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0038-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0038-test 2022-10-23 15:54:25.203658691 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0038-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0038-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0039-test texinfo-6.8.90/install-info/tests/ii-0039-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0039-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0039-test 2022-10-23 15:54:28.019639445 +0200
@@ -22,7 +22,7 @@
exit $retval
fi
-diff ${testdir}/ii-0039-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0039-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0040-test texinfo-6.8.90/install-info/tests/ii-0040-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0040-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0040-test 2022-10-23 15:55:35.431178686 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0040-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0040-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0041-test texinfo-6.8.90/install-info/tests/ii-0041-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0041-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0041-test 2022-10-23 15:57:23.535970876 +0200
@@ -27,7 +27,7 @@
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 -r -u texinfo-6.8.90.orig/install-info/tests/ii-0042-test texinfo-6.8.90/install-info/tests/ii-0042-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0042-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0042-test 2022-10-23 15:54:40.427554640 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0042-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0042-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0043-test texinfo-6.8.90/install-info/tests/ii-0043-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0043-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0043-test 2022-10-23 15:54:42.627539604 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0043-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0043-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0044-test texinfo-6.8.90/install-info/tests/ii-0044-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0044-test 2022-02-11 22:56:26.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0044-test 2022-10-23 15:54:44.739525169 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0044-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0044-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0045-test texinfo-6.8.90/install-info/tests/ii-0045-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0045-test 2022-02-11 22:56:30.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0045-test 2022-10-23 15:54:48.619498650 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0045-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0045-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0046-test texinfo-6.8.90/install-info/tests/ii-0046-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0046-test 2022-02-11 22:56:26.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0046-test 2022-10-23 15:54:52.219474044 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0046-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0046-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0047-test texinfo-6.8.90/install-info/tests/ii-0047-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0047-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0047-test 2022-10-23 15:54:54.507458406 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0047-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0047-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0048-test texinfo-6.8.90/install-info/tests/ii-0048-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0048-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0048-test 2022-10-23 15:54:57.027441182 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0048-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0048-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0049-test texinfo-6.8.90/install-info/tests/ii-0049-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0049-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0049-test 2022-10-23 15:54:59.379425106 +0200
@@ -21,7 +21,7 @@
exit $retval
fi
-diff ${testdir}/ii-0049-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0049-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0050-test texinfo-6.8.90/install-info/tests/ii-0050-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0050-test 2022-02-11 22:56:29.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0050-test 2022-10-23 15:57:32.275629646 +0200
@@ -28,7 +28,7 @@
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 -r -u texinfo-6.8.90.orig/install-info/tests/ii-0051-test texinfo-6.8.90/install-info/tests/ii-0051-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0051-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0051-test 2022-10-23 15:55:07.435370044 +0200
@@ -23,7 +23,7 @@
exit $retval
fi
-diff ${testdir}/ii-0051-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0051-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0052-test texinfo-6.8.90/install-info/tests/ii-0052-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0052-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0052-test 2022-10-23 15:55:09.915353093 +0200
@@ -23,7 +23,7 @@
exit $retval
fi
-diff ${testdir}/ii-0052-expected-dir-file $outputdirfile
+${diff} ${testdir}/ii-0052-expected-dir-file $outputdirfile
retval=$?
rm -f $outputdirfile
diff -r -u texinfo-6.8.90.orig/install-info/tests/ii-0053-test texinfo-6.8.90/install-info/tests/ii-0053-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0053-test 2022-02-11 22:56:27.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0053-test 2022-10-23 15:55:12.459335704 +0200
@@ -17,7 +17,7 @@
${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 -r -u texinfo-6.8.90.orig/install-info/tests/ii-0054-test texinfo-6.8.90/install-info/tests/ii-0054-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0054-test 2022-02-11 22:56:26.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0054-test 2022-10-23 15:55:14.771319902 +0200
@@ -18,7 +18,7 @@
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 -r -u texinfo-6.8.90.orig/install-info/tests/ii-0055-test texinfo-6.8.90/install-info/tests/ii-0055-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0055-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0055-test 2022-10-23 15:55:17.275302786 +0200
@@ -21,7 +21,7 @@
${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 -r -u texinfo-6.8.90.orig/install-info/tests/ii-0056-test texinfo-6.8.90/install-info/tests/ii-0056-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0056-test 2022-02-11 22:56:28.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0056-test 2022-10-23 15:55:19.627286710 +0200
@@ -21,7 +21,7 @@
${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 -r -u texinfo-6.8.90.orig/install-info/tests/ii-0057-test texinfo-6.8.90/install-info/tests/ii-0057-test
--- texinfo-6.8.90.orig/install-info/tests/ii-0057-test 2022-02-11 22:56:30.000000000 +0100
+++ texinfo-6.8.90/install-info/tests/ii-0057-test 2022-10-23 15:55:22.027270306 +0200
@@ -20,7 +20,7 @@
${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
