texlive[61083] avoid TeX/Automake conflict creating .log files
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 17 03:55:42 CET 2021
Revision: 61083
http://tug.org/svn/texlive?view=revision&revision=61083
Author: karl
Date: 2021-11-17 03:55:42 +0100 (Wed, 17 Nov 2021)
Log Message:
-----------
avoid TeX/Automake conflict creating .log files running tests
Modified Paths:
--------------
trunk/Build/source/texk/web2c/Makefile.in
trunk/Build/source/texk/web2c/hitexdir/ChangeLog
trunk/Build/source/texk/web2c/hitexdir/am/hitex.am
trunk/Build/source/texk/web2c/hitexdir/tests/hello.test
trunk/Build/source/texk/web2c/hitexdir/tests/hello.tex
trunk/Build/source/texk/web2c/hitexdir/tests/rule.test
trunk/Build/source/texk/web2c/hitexdir/tests/rule.tex
Added Paths:
-----------
trunk/Build/source/texk/web2c/hitexdir/tex/README
Property Changed:
----------------
trunk/Build/source/texk/web2c/hitexdir/tests/hello.test
trunk/Build/source/texk/web2c/hitexdir/tests/hello.tex
trunk/Build/source/texk/web2c/hitexdir/tests/rule.test
trunk/Build/source/texk/web2c/hitexdir/tests/rule.tex
Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in 2021-11-17 02:23:43 UTC (rev 61082)
+++ trunk/Build/source/texk/web2c/Makefile.in 2021-11-17 02:55:42 UTC (rev 61083)
@@ -3279,21 +3279,21 @@
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 @@
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_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 @@
#
-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 @@
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)
Modified: trunk/Build/source/texk/web2c/hitexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/ChangeLog 2021-11-17 02:23:43 UTC (rev 61082)
+++ trunk/Build/source/texk/web2c/hitexdir/ChangeLog 2021-11-17 02:55:42 UTC (rev 61083)
@@ -1,3 +1,12 @@
+2021-11-16 Karl Berry <karl at 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 at freefriends.org>
* am/hitex.am (AM_YFLAGS): comment out since we aren't doing
Modified: trunk/Build/source/texk/web2c/hitexdir/am/hitex.am
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/am/hitex.am 2021-11-17 02:23:43 UTC (rev 61082)
+++ trunk/Build/source/texk/web2c/hitexdir/am/hitex.am 2021-11-17 02:55:42 UTC (rev 61083)
@@ -71,18 +71,16 @@
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,13 +98,12 @@
## HiTeX tests
#
-hitex_tests = hitexdir/tests/rule.test\
- hitexdir/tests/hello.test
+hitex_tests = hitexdir/tests/hello.test \
+ hitexdir/tests/rule.test
+hitexdir/tests/hello.log: hitex$(EXEEXT) histretch$(EXEEXT)
hitexdir/tests/rule.log: hitex$(EXEEXT) histretch$(EXEEXT) hishrink$(EXEEXT)
-hitexdir/tests/hello.log: hitex$(EXEEXT) histretch$(EXEEXT)
-
EXTRA_DIST += $(hitex_tests)
if HITEX
@@ -113,10 +110,12 @@
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)
Modified: trunk/Build/source/texk/web2c/hitexdir/tests/hello.test
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/tests/hello.test 2021-11-17 02:23:43 UTC (rev 61082)
+++ trunk/Build/source/texk/web2c/hitexdir/tests/hello.test 2021-11-17 02:55:42 UTC (rev 61083)
@@ -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 @@
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
-
Property changes on: trunk/Build/source/texk/web2c/hitexdir/tests/hello.test
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/hitexdir/tests/hello.tex
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/tests/hello.tex 2021-11-17 02:23:43 UTC (rev 61082)
+++ trunk/Build/source/texk/web2c/hitexdir/tests/hello.tex 2021-11-17 02:55:42 UTC (rev 61083)
@@ -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
Property changes on: trunk/Build/source/texk/web2c/hitexdir/tests/hello.tex
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/hitexdir/tests/rule.test
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/tests/rule.test 2021-11-17 02:23:43 UTC (rev 61082)
+++ trunk/Build/source/texk/web2c/hitexdir/tests/rule.test 2021-11-17 02:55:42 UTC (rev 61083)
@@ -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
-
Property changes on: trunk/Build/source/texk/web2c/hitexdir/tests/rule.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/hitexdir/tests/rule.tex
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/tests/rule.tex 2021-11-17 02:23:43 UTC (rev 61082)
+++ trunk/Build/source/texk/web2c/hitexdir/tests/rule.tex 2021-11-17 02:55:42 UTC (rev 61083)
@@ -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
Property changes on: trunk/Build/source/texk/web2c/hitexdir/tests/rule.tex
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Added: trunk/Build/source/texk/web2c/hitexdir/tex/README
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/tex/README (rev 0)
+++ trunk/Build/source/texk/web2c/hitexdir/tex/README 2021-11-17 02:55:42 UTC (rev 61083)
@@ -0,0 +1,2 @@
+$Id$
+TeX input files for HiTeX. Eventually will end up in the Master/ runtime tree.
Property changes on: trunk/Build/source/texk/web2c/hitexdir/tex/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
More information about the tex-live-commits
mailing list.