avoid TeX/Automake conflict creating .log files running tests

git-svn-id: svn://tug.org/texlive/trunk@61083 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 91 insertions, 73 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 9725ba44492..3c970b7d440 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -3279,21 +3279,21 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	euptexdir/pdfprimitive.test \
 	eptexdir/tests/pdfprimitive-test.tex \
 	euptexdir/tests/pdfprimitive-euptex.log hitexdir/ChangeLog \
-	$(hitex_web) $(hitex_tests) tests/rule.tex \
-	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
-	$(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/ChangeLog \
-	pdftexdir/NEWS pdftexdir/README pdftexdir/change-files.txt \
-	$(pdftex_tests) tests/wprob.tex pdftexdir/tests/pdfimage.tex \
-	tests/1-4.jpg tests/B.pdf tests/basic.tex \
-	tests/lily-ledger-broken.png tests/expanded.tex \
-	tests/expanded.txt tests/cnfline.tex tests/partoken-ok.tex \
-	tests/partoken-xfail.tex $(ttf2afm_tests) \
-	pdftexdir/tests/postV3.afm pdftexdir/tests/postV3.ttf \
-	pdftexdir/tests/postV7.afm pdftexdir/tests/postV7.ttf \
-	$(pdftosrc_tests) pdftexdir/tests/test-13.pdf \
-	pdftexdir/tests/test-13.xref pdftexdir/tests/test-15.pdf \
-	pdftexdir/tests/test-15.xref $(libluasocket_sources) \
-	luatexdir/luasocket/src/ftp_lua.c \
+	$(hitex_web) $(hitex_tests) hitexdir/tests/hello.tex \
+	hitexdir/tests/rule.tex pdftexdir/regex/COPYING.LIB \
+	pdftexdir/regex/README $(pdftex_ch_srcs) \
+	pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \
+	pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
+	tests/wprob.tex pdftexdir/tests/pdfimage.tex tests/1-4.jpg \
+	tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \
+	tests/expanded.tex tests/expanded.txt tests/cnfline.tex \
+	tests/partoken-ok.tex tests/partoken-xfail.tex \
+	$(ttf2afm_tests) pdftexdir/tests/postV3.afm \
+	pdftexdir/tests/postV3.ttf pdftexdir/tests/postV7.afm \
+	pdftexdir/tests/postV7.ttf $(pdftosrc_tests) \
+	pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \
+	pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref \
+	$(libluasocket_sources) luatexdir/luasocket/src/ftp_lua.c \
 	luatexdir/luasocket/src/headers_lua.c \
 	luatexdir/luasocket/src/http_lua.c \
 	luatexdir/luasocket/src/ltn12_lua.c \
@@ -3604,12 +3604,12 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	euptex.p euptex.pool euptex-tangle euptrip.diffs \
 	pdfprimitive-euptex.* $(nodist_hitex_SOURCES) \
 	$(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
-	hiformat-tangle hitex-tangle rule.log $(nodist_pdftex_SOURCES) \
-	pdftex-final.ch pdftex-web2c pdftex.p pdftex.pool \
-	pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt pdfimage.log \
-	pdfimage.pdf expanded.log cnfline.log partoken-ok.log \
-	partoken-xfail.log postV3.afm postV7.afm test-13.pdf \
-	test-13.xref test-15.pdf test-15.xref \
+	hiformat-tangle hitex-tangle hello.log rule.log \
+	$(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c pdftex.p \
+	pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \
+	pdfimage.log pdfimage.pdf expanded.log cnfline.log \
+	partoken-ok.log partoken-xfail.log postV3.afm postV7.afm \
+	test-13.pdf test-13.xref test-15.pdf test-15.xref \
 	$(nodist_libluatex_sources) luaimage.* luajitimage.* \
 	$(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \
 	xetex.p xetex.pool xetex-tangle bug73.fmt bug73.log bug73.out \
@@ -4609,12 +4609,10 @@ nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
 nodist_histretch_SOURCES = hitables.c histretch.c
 
 # The actual sources for the lexer and parser are in hiformat.w.
-# However, to simplify life with Automake (a little), we include the
-# generated [.ch] files as if they were the sources here, and don't try
-# to have Automake support the derivation from .w.
+# However, to simplify life with Automake (a little), we specify the
+# generated .[ch] files here as if they were the sources, and don't try
+# to have Automake support the derivation from .w, or even from the .[ly].
 #
-# The $(srcdir) is not necessary if everything is up to date,
-# but can help with the remake if the [.ch] or [.ly] are not present.
 nodist_hishrink_SOURCES = hitables.c \
   hitexdir/hilexer.c \
   hitexdir/hiparser.c hitexdir/hiparser.h \
@@ -4622,7 +4620,9 @@ nodist_hishrink_SOURCES = hitables.c \
 
 
 #
-hitex_tests = hitexdir/tests/rule.test
+hitex_tests = hitexdir/tests/hello.test \
+  hitexdir/tests/rule.test
+
 libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags)
 libpdftex_a_CXXFLAGS = $(WARNING_CXXFLAGS)
 libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
@@ -22119,13 +22119,16 @@ hitex-tangle: ctangle$(EXEEXT) hitexdir/hitex.w tangle-sh
 hitables.c: himktables
 	./himktables > $@ || { rm -f hitables.c; exit 1; }
 
-# This is our attempt to ensure that bison got run before anything else,
+# This is our attempt to ensure that bison gets run before anything else,
 # when needed.
 #
 $(hishrink_OBJECTS): $(srcdir)/hitexdir/hiparser.h
 
+hitexdir/tests/hello.log: hitex$(EXEEXT) histretch$(EXEEXT)
 hitexdir/tests/rule.log: hitex$(EXEEXT) histretch$(EXEEXT) hishrink$(EXEEXT)
 
+# (end of hitex.am)
+
 # We must create pdftexd.h (and xpdf...) before building the libpdftex_a_OBJECTS.
 $(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
 $(pdftex_OBJECTS): $(pdftex_prereq)
diff --git a/Build/source/texk/web2c/hitexdir/ChangeLog b/Build/source/texk/web2c/hitexdir/ChangeLog
index 0dae85927dc..6d08a28f770 100644
--- a/Build/source/texk/web2c/hitexdir/ChangeLog
+++ b/Build/source/texk/web2c/hitexdir/ChangeLog
@@ -1,3 +1,12 @@
+2021-11-16  Karl Berry  <karl@freefriends.org>
+
+	* am/hitex.am: doc.
+	* tests/hello.test,
+	* tests/rule.test (OUTDIR): use subdir hitexdir/tests/outdir,
+	not hitexdir/tests, to avoid clash of both TeX and Automake
+	creating hitexdir/tests/TEST.log files.
+	Also, avoid GNU diff-specific options.
+
 2021-10-05  Karl Berry  <karl@freefriends.org>
 
 	* am/hitex.am (AM_YFLAGS): comment out since we aren't doing
diff --git a/Build/source/texk/web2c/hitexdir/am/hitex.am b/Build/source/texk/web2c/hitexdir/am/hitex.am
index 10a985feae5..9afaf561a73 100644
--- a/Build/source/texk/web2c/hitexdir/am/hitex.am
+++ b/Build/source/texk/web2c/hitexdir/am/hitex.am
@@ -71,18 +71,16 @@ nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
 nodist_histretch_SOURCES = hitables.c histretch.c
 
 # The actual sources for the lexer and parser are in hiformat.w.
-# However, to simplify life with Automake (a little), we include the
-# generated [.ch] files as if they were the sources here, and don't try
-# to have Automake support the derivation from .w.
+# However, to simplify life with Automake (a little), we specify the
+# generated .[ch] files here as if they were the sources, and don't try
+# to have Automake support the derivation from .w, or even from the .[ly].
 #
-# The $(srcdir) is not necessary if everything is up to date,
-# but can help with the remake if the [.ch] or [.ly] are not present.
 nodist_hishrink_SOURCES = hitables.c \
   hitexdir/hilexer.c \
   hitexdir/hiparser.c hitexdir/hiparser.h \
   hishrink.c
 
-# This is our attempt to ensure that bison got run before anything else,
+# This is our attempt to ensure that bison gets run before anything else,
 # when needed.
 #
 $(hishrink_OBJECTS): $(srcdir)/hitexdir/hiparser.h
@@ -100,12 +98,11 @@ DISTCLEANFILES += hiformat-tangle hitex-tangle
 
 ## HiTeX tests
 #
-hitex_tests = hitexdir/tests/rule.test\
-	hitexdir/tests/hello.test
+hitex_tests = hitexdir/tests/hello.test \
+  hitexdir/tests/rule.test
 
-hitexdir/tests/rule.log: hitex$(EXEEXT) histretch$(EXEEXT) hishrink$(EXEEXT)
 hitexdir/tests/hello.log: hitex$(EXEEXT) histretch$(EXEEXT)
-
+hitexdir/tests/rule.log: hitex$(EXEEXT) histretch$(EXEEXT) hishrink$(EXEEXT)
 
 EXTRA_DIST += $(hitex_tests)
 
@@ -113,10 +110,12 @@ if HITEX
 TESTS += $(hitex_tests)
 endif HITEX
 
+## hello.test
+EXTRA_DIST += hitexdir/tests/hello.tex 
+DISTCLEANFILES += hello.log
+
 ## rule.test
-EXTRA_DIST += tests/rule.tex 
+EXTRA_DIST += hitexdir/tests/rule.tex 
 DISTCLEANFILES += rule.log
 
-## hello.test
-EXTRA_DIST += tests/hello.tex 
-DISTCLEANFILES += hello.log
+# (end of hitex.am)
diff --git a/Build/source/texk/web2c/hitexdir/tests/hello.test b/Build/source/texk/web2c/hitexdir/tests/hello.test
index 41f43e4179c..6ab7dddb747 100755
--- a/Build/source/texk/web2c/hitexdir/tests/hello.test
+++ b/Build/source/texk/web2c/hitexdir/tests/hello.test
@@ -1,5 +1,5 @@
-#!/bin/sh
-# $Id: rule.test $
+#!/bin/sh -vx
+# $Id$
 # Public domain. Originally written by Martin Ruckert
 # Basic check that rule.tex can be hitexed stretched and shrinked.
 
@@ -8,20 +8,27 @@ LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
 TEXINPUTS=$srcdir/hitexdir/tests; export TEXINPUTS
 TFMFONTS=$srcdir/tests; export TFMFONTS
-#PKFONTS=$srcdir/tests; export PKFONTS
 T1FONTS=$srcdir/tests; export T1FONTS
-OUTDIR=./hitexdir/tests
 
-./hitex -ini -interaction=nonstopmode -output-directory=$OUTDIR hello.tex || exit $?
+# separate from hitexdir/tests because automake writes hello.log
+# in hitexdir/tests (so it already exists).
+OUTDIR=./hitexdir/tests/outdir; mkdir $OUTDIR
+
+#./hitex --help >/dev/null  || exit $?
+./hitex --version || exit $?
+
+./hitex -ini -interaction=nonstopmode -output-directory=$OUTDIR hello.tex \
+|| exit $?
+
 ./histretch -n $OUTDIR/hello.hnt || exit $?
 
-if grep -q "<section 3 '../../../texk/web2c/tests/cmr10.tfm'>" $OUTDIR/hello.HINT
-then
-    : # OK
+if grep "<section 3 '../../../texk/web2c/tests/cmr10.tfm'>" \
+        $OUTDIR/hello.HINT >/dev/null; then
+  : # OK
 else
-    echo "hello.HINT does not contain the propper .tfm file" >&2
-    exit 1
+  echo "hello.HINT does not contain the proper <section with" \
+       " cmr10.tfm, goodbye." >&2
+  exit 1
 fi
 
 exit 0
-
diff --git a/Build/source/texk/web2c/hitexdir/tests/hello.tex b/Build/source/texk/web2c/hitexdir/tests/hello.tex
index 0f74b2a9183..2e12467483c 100644
--- a/Build/source/texk/web2c/hitexdir/tests/hello.tex
+++ b/Build/source/texk/web2c/hitexdir/tests/hello.tex
@@ -1,5 +1,5 @@
-% $Id: rule.tex $
-% Public domain. Test file for generating a single rule
+% $Id$
+% Public domain. Test file for hello,world text.
 % Originally written 2021 Martin Ruckert
 
 \catcode`\{=1 \catcode`\}=2 % can run under -ini
diff --git a/Build/source/texk/web2c/hitexdir/tests/rule.test b/Build/source/texk/web2c/hitexdir/tests/rule.test
index 48644f83445..989ca1bf100 100644..100755
--- a/Build/source/texk/web2c/hitexdir/tests/rule.test
+++ b/Build/source/texk/web2c/hitexdir/tests/rule.test
@@ -1,34 +1,32 @@
-#!/bin/sh
-# $Id: rule.test $
+#!/bin/sh -vx
+# $Id$
 # Public domain. Originally written by Martin Ruckert
-# Basic check that rule.tex can be hitexed stretched and shrinked.
+# Basic check that rule.tex can be hitexed, histretched, hishrinked.
 
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
 TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
 TEXINPUTS=$srcdir/hitexdir/tests; export TEXINPUTS
-OUTDIR=./hitexdir/tests
+OUTDIR=./hitexdir/tests/outdir; mkdir $OUTDIR
 
-./hitex -ini --interaction=nonstopmode -output-directory=$OUTDIR rule.tex || exit $?
+./hitex -ini --interaction=nonstopmode -output-directory=$OUTDIR rule.tex \
+|| exit $?
 ./histretch $OUTDIR/rule.hnt || exit $?
 ./hishrink -o $OUTDIR/rule.out.hnt $OUTDIR/rule.HINT || exit $?
 ./histretch $OUTDIR/rule.out.hnt || exit $?
 
-if grep -q "<rule 0x48.451Ept 1pt 0x1C.73E7pt>" $OUTDIR/rule.HINT
-then
-    : # OK
+if grep "<rule 0x48.451Ept 1pt 0x1C.73E7pt>" $OUTDIR/rule.HINT >/dev/null; then
+  : # OK
 else
-    echo "rule.HINT does not contain the propper rule" >&2
-    exit 1
+  echo "rule.HINT does not contain the proper <rule, goodbye." >&2
+  exit 1
 fi
 
-if diff -q -w $OUTDIR/rule.out.HINT $OUTDIR/rule.HINT
-then
-    : #OK
+if diff $OUTDIR/rule.out.HINT $OUTDIR/rule.HINT; then # -w?
+  : # OK
 else
-    echo "rule.out.HINT and rule.HINT differ" >&2
-    exit 1
+  echo "rule.out.HINT and rule.HINT differ, goodbye." >&2
+  exit 1
 fi
 
 exit 0
-
diff --git a/Build/source/texk/web2c/hitexdir/tests/rule.tex b/Build/source/texk/web2c/hitexdir/tests/rule.tex
index b35b0a9abca..e990c4277e4 100644
--- a/Build/source/texk/web2c/hitexdir/tests/rule.tex
+++ b/Build/source/texk/web2c/hitexdir/tests/rule.tex
@@ -1,5 +1,5 @@
-% $Id: rule.tex $
-% Public domain. Test file for generating a single rule
+% $Id$
+% Public domain. Test file for generating a single rule.
 % Originally written 2021 Martin Ruckert
 
 \catcode`\{=1 \catcode`\}=2 % can run under -ini
diff --git a/Build/source/texk/web2c/hitexdir/tex/README b/Build/source/texk/web2c/hitexdir/tex/README
new file mode 100644
index 00000000000..50e5384bc55
--- /dev/null
+++ b/Build/source/texk/web2c/hitexdir/tex/README
@@ -0,0 +1,2 @@
+$Id$
+TeX input files for HiTeX. Eventually will end up in the Master/ runtime tree.