diff options
author | Karl Berry <karl@freefriends.org> | 2014-04-28 13:32:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-04-28 13:32:21 +0000 |
commit | e6fefd95977da2f1aa1a512a3fcc871681deb59c (patch) | |
tree | e770df3d490a467304c9362237adbd7c86cd8e21 /Build/source/texk/tests/TeXLive | |
parent | 2ed896f0ff420a76dcea8e4a26f5184ad9c331d0 (diff) |
sync
git-svn-id: svn://tug.org/texlive/trunk@33720 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/tests/TeXLive')
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLConfig.pm | 7 | ||||
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 19 |
2 files changed, 19 insertions, 7 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm index df3395badbf..840d5f78be2 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: 33475 $'; +my $svnrev = '$Revision: 33571 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -47,6 +47,7 @@ BEGIN { %TLPDBSettings %TLPDBConfigs $NetworkTimeout + $PartialEngineSupport ); @EXPORT = @EXPORT_OK; } @@ -190,7 +191,9 @@ our %TLPDBSettings = ( our $WindowsMainMenuName = "TeX Live $ReleaseYear"; -# +# Comma-separated list of engines which do not exist on all platforms. +our $PartialEngineSupport = "luajittex"; + # timeout for network connections (wget, LWP) in seconds our $NetworkTimeout = 30; diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index 62609908024..cc3735299f3 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: 33475 $'; +my $svnrev = '$Revision: 33564 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -200,6 +200,7 @@ use Cwd; use Digest::MD5; use Getopt::Long; use File::Temp; +use Time::HiRes; use TeXLive::TLConfig; @@ -1397,12 +1398,20 @@ sub install_packages { $tlpobj->replace_reloc_prefix; } $totlpdb->add_tlpobj($tlpobj); + # we have to write out the tlpobj file since it is contained in the - # archives (.tar.xz) but at uncompressed-media install time we don't have them + # archives (.tar.xz), but at uncompressed-media install time we + # don't have them. my $tlpod = $totlpdb->root . "/tlpkg/tlpobj"; - mkdirhier( $tlpod ); - open(TMP,">$tlpod/".$tlpobj->name.".tlpobj") || - die "$0: open tlpobj " . $tlpobj->name . "failed: $!"; + mkdirhier($tlpod); + my $count = 0; + my $tlpobj_file = ">$tlpod/" . $tlpobj->name . ".tlpobj"; + until (open(TMP, $tlpobj_file)) { + # The open might fail for no good reason on Windows. + # Try again for a while, but not forever. + if ($count++ == 100) { die "$0: open($tlpobj_file) failed: $!"; } + Time::HiRes::sleep(0.01); # sleep briefly + } $tlpobj->writeout(\*TMP); close(TMP); $donesize += $tlpsizes{$package}; |