From bc334c3dd9395017a3d0327cd0ef1d88da2c290a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 8 Mar 2021 18:40:56 +0000 Subject: cnfline.test adapt to --enable-shared, with different $0 git-svn-id: svn://tug.org/texlive/trunk@58227 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 9 +++++++++ Build/source/texk/kpathsea/tests/cnfline.test | 4 ++++ Build/source/texk/kpathsea/tests/cnfline/texmf.cnf | 9 +++++++++ 3 files changed, 22 insertions(+) (limited to 'Build') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 5a0361e1ff0..2bf16aea7e6 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,12 @@ +2021-03-08 Karl Berry + + * tests/cnfline/texmf.cnf (maxpr.lt-kpsewhich): set this, + for --enable-shared builds. + https://tug.org/pipermail/tex-k/2021-March/003490.html + * tests/cnfline.test: unset maxpr othervar, just in case + they are set in the environment. Maybe unset on an unset variable + is portable enough nowadays? + 2021-02-17 Karl Berry * doc/kpathsea.texi, diff --git a/Build/source/texk/kpathsea/tests/cnfline.test b/Build/source/texk/kpathsea/tests/cnfline.test index bffe8808b9d..076d9a78281 100755 --- a/Build/source/texk/kpathsea/tests/cnfline.test +++ b/Build/source/texk/kpathsea/tests/cnfline.test @@ -5,6 +5,10 @@ cnf_dir=$srcdir/tests/cnfline +# just in case they are set in the environment +unset maxpr +unset othervar + # Just for fun, let's first try the --cnf-line feature to set TEXMFCNF. val=`./kpsewhich "--cnf-line=TEXMFCNF=$cnf_dir" --var-value=othervar` test x"$val" = x300 || exit 1 diff --git a/Build/source/texk/kpathsea/tests/cnfline/texmf.cnf b/Build/source/texk/kpathsea/tests/cnfline/texmf.cnf index 164f25744f5..e4e3a1fad09 100644 --- a/Build/source/texk/kpathsea/tests/cnfline/texmf.cnf +++ b/Build/source/texk/kpathsea/tests/cnfline/texmf.cnf @@ -1,5 +1,14 @@ # $Id$ # Public domain. This tiny texmf.cnf is for kpathsea/tests/cnfline.test. maxpr=100 + +# static build: maxpr.kpsewhich=200 + +# with --enable-shared (libtool) build, the binary has a different name. +# although we could also work around this by specifying --progname in +# cnfline.test, one goal of the test is to check what happens when +# --progname is not specified. +maxpr.lt-kpsewhich=200 + othervar=300 -- cgit v1.2.3