summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2003-12-12 12:03:59 +0000
committerdes <des@FreeBSD.org>2003-12-12 12:03:59 +0000
commitef6b8673419b72c67d48ffba916d2a59e1bb7cf0 (patch)
tree3eca466f63dd744b7649aeaf3895a2ab6f9b8b2e /tools
parent284d477413404d4aed569db964457a8da0e24d9f (diff)
downloadFreeBSD-src-ef6b8673419b72c67d48ffba916d2a59e1bb7cf0.zip
FreeBSD-src-ef6b8673419b72c67d48ffba916d2a59e1bb7cf0.tar.gz
Revert the last two commits. It seems that compat mode is actually faster
than non-compat (using -j1), though reading the make(1) sources suggests that the opposite is true.
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/tinderbox/tinderbox.pl11
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/tools/tinderbox/tinderbox.pl b/tools/tools/tinderbox/tinderbox.pl
index f0aaf86..5db0707 100644
--- a/tools/tools/tinderbox/tinderbox.pl
+++ b/tools/tools/tinderbox/tinderbox.pl
@@ -207,7 +207,9 @@ sub spawn($@) {
sub make($) {
my $target = shift;
- return spawn('/usr/bin/make', "-j$jobs", $target);
+ return spawn('/usr/bin/make',
+ ($jobs > 1) ? "-j$jobs" : "-B",
+ $target);
}
sub logstage($) {
@@ -282,7 +284,7 @@ MAIN:{
$machine = `/usr/bin/uname -m`;
chomp($machine);
$branch = "CURRENT";
- $jobs = 1;
+ $jobs = 0;
$repository = "/home/ncvs";
$sandbox = "/tmp/tinderbox";
@@ -302,7 +304,7 @@ MAIN:{
"v|verbose+" => \$verbose,
) or usage();
- if ($jobs < 1) {
+ if ($jobs < 0) {
error("invalid number of jobs");
}
if ($branch !~ m|^(\w+)$|) {
@@ -464,7 +466,8 @@ MAIN:{
if $branch ne 'CURRENT';
$ENV{'CVSCMDARGS'} = "-D$date"
if defined($date);
- $ENV{'WORLD_FLAGS'} = $ENV{'KERNEL_FLAGS'} = "-j$jobs";
+ $ENV{'WORLD_FLAGS'} = $ENV{'KERNEL_FLAGS'} =
+ ($jobs > 1) ? "-j$jobs" : "-B";
if ($patch) {
$ENV{'LOCAL_PATCHES'} = $patch;
$ENV{'PATCH_FLAGS'} = "-fs";
OpenPOWER on IntegriCloud