tests: Fix t_dist_install breaking corunning test
This commit is contained in:
parent
65de8359e7
commit
c4504a9221
|
|
@ -313,7 +313,8 @@ uninstall:
|
||||||
-rmdir $(DESTDIR)$(pkgdatadir)/examples
|
-rmdir $(DESTDIR)$(pkgdatadir)/examples
|
||||||
-rmdir $(DESTDIR)$(pkgdatadir)
|
-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
|
install-here: installman ftp
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -133,10 +133,13 @@ $Fork->wait_all(); # Wait for all children to finish
|
||||||
|
|
||||||
sub one_test {
|
sub one_test {
|
||||||
my @params = @_;
|
my @params = @_;
|
||||||
|
my %params = (@params);
|
||||||
$leftcnt++;
|
$leftcnt++;
|
||||||
$Fork->schedule
|
$Fork->schedule
|
||||||
(
|
(
|
||||||
|
test_pl_filename => $params{pl_filename},
|
||||||
run_on_start => sub {
|
run_on_start => sub {
|
||||||
|
# Running in context of child, so can't pass data to parent directly
|
||||||
print ("="x70,"\n");
|
print ("="x70,"\n");
|
||||||
my $test = VTest->new(@params);
|
my $test = VTest->new(@params);
|
||||||
$test->oprint("="x50,"\n");
|
$test->oprint("="x50,"\n");
|
||||||
|
|
@ -168,6 +171,11 @@ sub one_test {
|
||||||
.$test->{pl_filename}." ".join(' ',@Orig_ARGV_Sw)."\n";
|
.$test->{pl_filename}." ".join(' ',@Orig_ARGV_Sw)."\n";
|
||||||
$failcnt++;
|
$failcnt++;
|
||||||
report(\@fails, $Log_Filename);
|
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"; }
|
if ($opt_stop) { die "%Error: --stop and errors found\n"; }
|
||||||
}
|
}
|
||||||
$leftcnt--;
|
$leftcnt--;
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ if (!-r "$root/.git") {
|
||||||
check_finished=>0);
|
check_finished=>0);
|
||||||
# Install into temp area
|
# Install into temp area
|
||||||
print "Install...\n";
|
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_finished=>0);
|
||||||
|
|
||||||
# Check we can run a test
|
# Check we can run a test
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue