diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-14 21:58:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-14 21:58:34 +0000 |
commit | ed217b0fe7b739f3456133badebfb6533fbaa903 (patch) | |
tree | 8c2e35b295dd785f6e2af371aad5fbe4e6a29e6b /Build/source/texk/tests/TeXLive | |
parent | 0d0a8e1ba25d24da6db332760588a1a922028652 (diff) |
sync
git-svn-id: svn://tug.org/texlive/trunk@52796 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/tests/TeXLive')
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLConfig.pm | 4 | ||||
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm index cf68faf5c00..8e3117a6b72 100644 --- a/Build/source/texk/tests/TeXLive/TLConfig.pm +++ b/Build/source/texk/tests/TeXLive/TLConfig.pm @@ -5,7 +5,7 @@ package TeXLive::TLConfig; -my $svnrev = '$Revision: 52112 $'; +my $svnrev = '$Revision: 52745 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -232,7 +232,7 @@ our %TLPDBSettings = ( our $WindowsMainMenuName = "TeX Live $ReleaseYear"; # Comma-separated list of engines which do not exist on all platforms. -our $PartialEngineSupport = "luajittex,mfluajit"; +our $PartialEngineSupport = "luahbtex,luajittex,mfluajit"; # Flags for error handling across the scripts and modules # all fine diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index 0aab6a6248c..9ee9674214e 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 52568 $'; +my $svnrev = '$Revision: 52706 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -1129,6 +1129,7 @@ that is a fatal error. =cut sub copy { + #too verbose ddebug("TLUtils::copy(", join (",", @_), "\n"); my $infile = shift; my $filemode = 0; my $dereference = 0; @@ -1180,12 +1181,13 @@ sub copy { if ($linktarget !~ m,^/,) { $infile = Cwd::abs_path(dirname($infile)) . "/$linktarget"; } + ddebug("TLUtils::copy: dereferencing symlink $infile -> $linktarget"); } if (-l $infile) { my $linktarget = readlink($infile); my $dest = "$destdir/$filename"; - debug("TLUtils::copy: doing symlink($linktarget,$dest)" + ddebug("TLUtils::copy: doing symlink($linktarget,$dest)" . " [from readlink($infile)]\n"); symlink($linktarget, $dest) || die "symlink($linktarget,$dest) failed: $!"; } else { @@ -2521,7 +2523,7 @@ END_COMPRESSOR_BAD $::progs{'compressor'} = $ENV{'TEXLIVE_COMPRESSOR'}; } - if ($::opt_verbosity >= 1) { + if ($::opt_verbosity >= 2) { require Data::Dumper; use vars qw($Data::Dumper::Indent $Data::Dumper::Sortkeys $Data::Dumper::Purity); # -w pain @@ -2602,16 +2604,16 @@ sub setup_unix_tl_one { debug("(unix) trying to set up $p, default $def, arg $arg\n"); if (-r $def) { if (-x $def) { - ddebug("default $def has executable permissions\n"); + ddebug(" Default $def has executable permissions\n"); # we have to check for actual "executability" since a "noexec" # mount option may interfere, which is not taken into account by -x. my $ret = system("'$def' $arg >/dev/null 2>&1" ); # we are on Unix if ($ret == 0) { $::progs{$p} = $def; - debug("Using shipped $def for $p (tested).\n"); + debug(" Using shipped $def for $p (tested).\n"); return(1); } else { - ddebug("Shipped $def has -x but cannot be executed, " + ddebug(" Shipped $def has -x but cannot be executed, " . "trying tmp copy.\n"); } } @@ -2632,19 +2634,19 @@ sub setup_unix_tl_one { if (! -x $tmpprog) { # hmm, something is going really bad, not even the copy is # executable. Fall back to normal path element - ddebug("Copied $p $tmpprog does not have -x bit, strange!\n"); + ddebug(" Copied $p $tmpprog does not have -x bit, strange!\n"); return(0); } else { # check again for executability my $ret = system("$tmpprog $arg > /dev/null 2>&1"); if ($ret == 0) { # ok, the copy works - debug("Using copied $tmpprog for $p (tested).\n"); + debug(" Using copied $tmpprog for $p (tested).\n"); $::progs{$p} = $tmpprog; return(1); } else { # even the copied prog is not executable, strange - ddebug("Copied $p $tmpprog has x bit but not executable?!\n"); + ddebug(" Copied $p $tmpprog has x bit but not executable?!\n"); return(0); } } |