strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sb129: #i113189# adapted tests; improved subsequenttests

Browse source
This commit is contained in:
sb 2010-09-14 09:15:02 +02:00
parent 093b3a9498
commit e3ceb872bf
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
solenv/bin/subsequenttests
View file

@ -30,6 +30,8 @@ eval 'exec "$PERL" -Sw "$0" "$@"'
use lib("$ENV{SOLARENV}/bin/modules"); use lib("$ENV{SOLARENV}/bin/modules");
use SourceConfig; use SourceConfig;
my $keep_going = 0;
my $dry_run = 0;
my $max_running = 1; my $max_running = 1;
while (@ARGV) { while (@ARGV) {
my $arg = shift(@ARGV); my $arg = shift(@ARGV);
@ -38,11 +40,29 @@ while (@ARGV) {
} elsif ($arg eq '--') { } elsif ($arg eq '--') {
last; last;
} else { } else {
print STDERR "unknown argument \"$arg\"\n"; my $n = substr($arg, 0, 1) eq '-' ? 1 : 0;
print STDERR "usage: $0 [-P<n>] [-- <args>]\n"; while ($n && $n < length($arg)) {
print STDERR " -P<n> number of parallel dmake invocations\n"; my $c = substr($arg, $n++, 1);
print STDERR " <args> are passed to dmake invocations\n"; if ($c eq 'k') {
exit(1); $keep_going = 1;
} elsif ($c eq 'n') {
$dry_run = 1;
} else {
$n = 0;
last;
}
}
if (!$n) {
print STDERR "unknown argument \"$arg\"\n";
print STDERR "usage: $0 [-kn] [-P<n>] [-- <args>]\n";
print STDERR " -k continue with other dmake invocations upon\n";
print STDERR " failure\n";
print STDERR " -n write directories that would be processed\n";
print STDERR " to standard output\n";
print STDERR " -P<n> number of parallel dmake invocations\n";
print STDERR " <args> are passed to dmake invocations\n";
exit(1);
}
} }
} }
@ -82,6 +102,13 @@ foreach $module ($sc->get_active_modules()) {
} }
} }
if ($dry_run) {
foreach $path (@testpaths) {
print "$path\n";
}
exit(0);
}
my $cmd = 'dmake'; my $cmd = 'dmake';
foreach (@ARGV) { foreach (@ARGV) {
s/'/'\''/g; s/'/'\''/g;
@ -119,8 +146,8 @@ while (@testpaths || $running > 0) {
my $testpath = delete($pids{$pid}); my $testpath = delete($pids{$pid});
defined($testpath) or die("unmatched PID $pid"); defined($testpath) or die("unmatched PID $pid");
if ($? != 0) { if ($? != 0) {
@testpaths = ();
push(@failedpaths, $testpath); push(@failedpaths, $testpath);
@testpaths = () unless $keep_going;
} }
--$running; --$running;
} }

4
solenv/inc/settings.mk
View file

@ -1363,7 +1363,9 @@ COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/
.END .END
COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/ COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/
COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
COMPONENTPREFIX_INBUILD = vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/ COMPONENTPREFIX_INBUILD_NATIVE = \
vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/
COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$OOO_INBUILD_JAR_DIR/
# workaround for strange dmake bug: # workaround for strange dmake bug:
# if the previous block was a rule or a target, "\#" isn't recognized # if the previous block was a rule or a target, "\#" isn't recognized