summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2003-10-10 21:13:37 +0000
committerdes <des@FreeBSD.org>2003-10-10 21:13:37 +0000
commit477ef90c7b15394e386089aff50fec85d42cd488 (patch)
tree7736f6a74bc83da05c3b8a6c2248c70e1a3ce24d /tools
parent13c988b2af3fcc1d393c898f7fb1d6d65a0338fa (diff)
downloadFreeBSD-src-477ef90c7b15394e386089aff50fec85d42cd488.zip
FreeBSD-src-477ef90c7b15394e386089aff50fec85d42cd488.tar.gz
Add support for tinderbox(1)'s -h option.
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/tinderbox/tbmaster.17
-rw-r--r--tools/tools/tinderbox/tbmaster.pl5
2 files changed, 10 insertions, 2 deletions
diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index 9e9dad4..9bfc543 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 1, 2003
+.Dd October 10, 2003
.Dt TBMASTER 1
.Os
.Sh NAME
@@ -130,6 +130,11 @@ environment variable.
Note that it will not be defined unless it passes some simple sanity
checks.
Read-only.
+.It HOSTNAME
+.Pq Vt single
+The name of the host running the tinderbox.
+This is used for cosmetic purposes only.
+No default value.
.It LOGDIR
.Pq Vt single
The location of the log directory.
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 01d6da4..a702639 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -35,7 +35,7 @@ use Fcntl qw(:DEFAULT :flock);
use POSIX;
use Getopt::Long;
-my $VERSION = "2.1";
+my $VERSION = "2.2";
my $COPYRIGHT = "Copyright (c) 2003 Dag-Erling Smørgrav. " .
"All rights reserved.";
@@ -49,6 +49,7 @@ my %CONFIG = (
'PLATFORMS' => [ 'i386' ],
'DATE' => '',
'SANDBOX' => '/tmp/tinderbox',
+ 'HOSTNAME' => '',
'LOGDIR' => '%%SANDBOX%%/logs',
'TARGETS' => [ 'update', 'world' ],
'OPTIONS' => [],
@@ -187,6 +188,8 @@ sub tinderbox($$$) {
# Fork and start the tinderbox
my @args = @{$CONFIG{'OPTIONS'}};
+ push(@args, "--hostname=" . expand('HOSTNAME'))
+ if ($CONFIG{'HOSTNAME'});
push(@args, "--sandbox=" . expand('SANDBOX'));
push(@args, "--branch=$branch");
push(@args, "--arch=$arch");
OpenPOWER on IntegriCloud