tests: Fix t_dist_install breaking corunning test

This commit is contained in:
Wilson Snyder 2011-12-15 18:39:51 -05:00
parent 65de8359e7
commit c4504a9221
3 changed files with 11 additions and 2 deletions

View File

@ -313,7 +313,8 @@ uninstall:
-rmdir $(DESTDIR)$(pkgdatadir)/examples
-rmdir $(DESTDIR)$(pkgdatadir)
install: all_nomsg installbin installman installdata install-msg
install: all_nomsg install-all
install-all: installbin installman installdata install-msg
install-here: installman ftp

View File

@ -133,10 +133,13 @@ $Fork->wait_all(); # Wait for all children to finish
sub one_test {
my @params = @_;
my %params = (@params);
$leftcnt++;
$Fork->schedule
(
test_pl_filename => $params{pl_filename},
run_on_start => sub {
# Running in context of child, so can't pass data to parent directly
print ("="x70,"\n");
my $test = VTest->new(@params);
$test->oprint("="x50,"\n");
@ -168,6 +171,11 @@ sub one_test {
.$test->{pl_filename}." ".join(' ',@Orig_ARGV_Sw)."\n";
$failcnt++;
report(\@fails, $Log_Filename);
my $other = "";
foreach my $proc ($Fork->running) {
$other .= " ".$proc->{test_pl_filename};
}
$test->oprint("Simultaneous running tests:",$other,"\n") if $other;
if ($opt_stop) { die "%Error: --stop and errors found\n"; }
}
$leftcnt--;

View File

@ -22,7 +22,7 @@ if (!-r "$root/.git") {
check_finished=>0);
# Install into temp area
print "Install...\n";
$Self->_run (cmd=>["cd $root && make DESTDIR=$destdir install"],
$Self->_run (cmd=>["cd $root && make DESTDIR=$destdir install-all"],
check_finished=>0);
# Check we can run a test