d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always pass -j to make(1), even when we only want one job. It disables

Browse Source 
compat mode and hopefully improves tinderbox performance.
This commit is contained in:
Dag-Erling Smørgrav 2003-12-11 16:49:34 +00:00
parent 33b7c0d94c
commit e8064dd1a8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=123456
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/tools/tinderbox/tinderbox.1
View File

@ -91,18 +91,7 @@ The maximum number of paralell jobs, as specified to
using the
.Fl j
option.
The default is to use the
.Fl B
option instead, forbidding
.Xr make 1
to perform more than one task at a time.
Specifying
.Va 0
or
.Va 1
to the
.Fl -jobs
option is equivalent to leaving it unspecified.
The default is 1.
.It Fl l Ar FILE , Fl -logfile Ns = Ns Ar FILE
The name of a file to which the output and error messages produced by
the build should be written.

11
tools/tools/tinderbox/tinderbox.pl
View File

@ -207,9 +207,7 @@ sub spawn($@) {
sub make($) {
my $target = shift;
return spawn('/usr/bin/make',
($jobs > 1) ? "-j$jobs" : "-B",
$target);
return spawn('/usr/bin/make', "-Pj$jobs", $target);
}
sub logstage($) {
@ -284,7 +282,7 @@ MAIN:{
$machine = `/usr/bin/uname -m`;
chomp($machine);
$branch = "CURRENT";
$jobs = 0;
$jobs = 1;
$repository = "/home/ncvs";
$sandbox = "/tmp/tinderbox";
@ -304,7 +302,7 @@ MAIN:{
"v|verbose+" => \$verbose,
) or usage();
if ($jobs < 0) {
if ($jobs < 1) {
error("invalid number of jobs");
}
if ($branch !~ m|^(\w+)$|) {
@ -466,8 +464,7 @@ MAIN:{
if $branch ne 'CURRENT';
$ENV{'CVSCMDARGS'} = "-D$date"
if defined($date);
$ENV{'WORLD_FLAGS'} = $ENV{'KERNEL_FLAGS'} =
($jobs > 1) ? "-j$jobs" : "-B";
$ENV{'WORLD_FLAGS'} = $ENV{'KERNEL_FLAGS'} = "-Pj$jobs";
if ($patch) {
$ENV{'LOCAL_PATCHES'} = $patch;
$ENV{'PATCH_FLAGS'} = "-fs";