anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake export tests: Omit next group of possible conflicts while runnig test in parallel

Browse Source 
Disable conversion cache because all lyx instances use the same cache without
any locking between read and write to the cache.

Thanks to Scott catching this case.
This commit is contained in:
Kornel Benko 2020-08-19 22:28:50 +02:00
parent e3cfcce8c5
commit 4bb00e99fb
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/scripts/prefTest.pl.in
View File

@ -30,6 +30,8 @@ my %allowedKeys = (
"use_converter_needauth_forbidden" => ["true", "false"], "use_converter_needauth_forbidden" => ["true", "false"],
"use_converter_needauth" => ["true", "false"], "use_converter_needauth" => ["true", "false"],
"allow_geometry_session" => ["false"], "allow_geometry_session" => ["false"],
"use_converter_cache" => ["true", "false"],
"converter_cache_maxage" => "integer",
); );
my %Converter = (); my %Converter = ();
@ -53,14 +55,20 @@ if ($handle_argv eq "test") {
@ctestpars = &getSubstitutes(\%allowedKeys, \%Subst, @ctestpars = &getSubstitutes(\%allowedKeys, \%Subst,
"allow_geometry_session=false", "allow_geometry_session=false",
"use_converter_needauth_forbidden=false", "use_converter_needauth_forbidden=false",
"use_converter_needauth=false", @ARGV); "use_converter_needauth=false",
"use_converter_cache=false",
"converter_cache_maxage=" . 180*24*60*60,
@ARGV);
} }
elsif ($handle_argv eq "default") { elsif ($handle_argv eq "default") {
$shell_escapes = 0; $shell_escapes = 0;
@ctestpars = &getSubstitutes(\%allowedKeys, \%Subst, @ctestpars = &getSubstitutes(\%allowedKeys, \%Subst,
"allow_geometry_session=false", "allow_geometry_session=false",
"use_converter_needauth_forbidden=true", "use_converter_needauth_forbidden=true",
"use_converter_needauth=true", @ARGV); "use_converter_needauth=true",
"use_converter_cache=true",
"converter_cache_maxage=" . 61*24*60*60,
@ARGV);
} }
else { else {
@ctestpars = &getSubstitutes(\%allowedKeys, \%Subst, @ctestpars = &getSubstitutes(\%allowedKeys, \%Subst,

16
lib/scripts/prefTest.pm
View File

@ -31,6 +31,7 @@ sub getSubstitutes($$@)
my $value = $2; my $value = $2;
my $valid = 0; my $valid = 0;
if (defined($rAllowedKeys->{$key})) { if (defined($rAllowedKeys->{$key})) {
if (ref($rAllowedKeys->{$key}) eq "ARRAY") {
for my $val (@{$rAllowedKeys->{$key}}) { for my $val (@{$rAllowedKeys->{$key}}) {
if ($val eq $value) { if ($val eq $value) {
$valid = 1; $valid = 1;
@ -38,6 +39,15 @@ sub getSubstitutes($$@)
} }
} }
} }
elsif ($rAllowedKeys->{$key} eq "integer") {
if ($value =~ /^\d+$/) {
$valid = 1;
}
}
elsif ($rAllowedKeys->{$key} eq "string") {
$valid = 1;
}
}
if ($valid) { if ($valid) {
$rSubst->{$key} = [$value, 0]; $rSubst->{$key} = [$value, 0];
} }
@ -82,15 +92,15 @@ sub getConverter($$)
return undef if ($to !~ /^((dvi3?|pdf[23456]?)(log)?)$/); return undef if ($to !~ /^((dvi3?|pdf[23456]?)(log)?)$/);
($l, $cmd) = getNext($l); ($l, $cmd) = getNext($l);
if ($add) { if ($add) {
if ($cmd !~ /\-shell-escape/) { if ($cmd !~ /\-shell-(escape|restricted)/) {
if ($cmd =~ /^(\S+)\s*(.*)$/) { if ($cmd =~ /^(\S+)\s*(.*)$/) {
$cmd = "$1 -shell-escape $2"; $cmd = "$1 -shell-restricted $2";
$cmd =~ s/\s+$//; $cmd =~ s/\s+$//;
} }
} }
} }
else { else {
$cmd =~ s/\s+\-shell\-escape//; $cmd =~ s/\s+\-shell\-(escape|restricted)//;
} }
($l, $par) = getNext($l); ($l, $par) = getNext($l);
return undef if ($par !~ /^latex/); return undef if ($par !~ /^latex/);