summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2003-05-15 20:33:33 +0000
committerdes <des@FreeBSD.org>2003-05-15 20:33:33 +0000
commit5edcb9f9a820227896e9652d30b26af8c1d9abc9 (patch)
treed27321ad997683eb4a77eb46541d7a1fd2eaa755
parent81f4086b7f673c875557b56e2aa98cf7517fae33 (diff)
downloadFreeBSD-src-5edcb9f9a820227896e9652d30b26af8c1d9abc9.zip
FreeBSD-src-5edcb9f9a820227896e9652d30b26af8c1d9abc9.tar.gz
Explicitly set the sandbox directory (it defaults to ~/tinderbox which is
wrong when running a release tinderbox as root) Use the setup's COMMENT field in the subject of the failure report, instead of just "$branch tinderbox". Tweak the test setups.
-rw-r--r--tools/tools/tinderbox/tbmaster.pl10
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 1759a34..b5fe812 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -37,6 +37,7 @@ use Sys::Hostname;
my %CONFIGS = (
# Global settings
'global' => {
+ 'SANDBOX' => '/home/des/tinderbox',
'LOGDIR' => '/home/des/public_html',
'OPTIONS' => [ '--verbose' ],
'EMAIL' => 'des+%%arch%%-%%branch%%@freebsd.org',
@@ -92,13 +93,11 @@ my %CONFIGS = (
'i386' => [ 'i386' ],
},
'ENV' => {
- 'NOCRYPT' => 'YES',
'NOLIBC_R' => 'YES',
+ 'NOPERL' => 'YES',
'NOPROFILE' => 'YES',
- 'NOSECURE' => 'YES',
'NO_BIND' => 'YES',
'NO_FORTRAN' => 'YES',
- 'NO_KERBEROS' => 'YES',
'NO_SENDMAIL' => 'YES',
},
},
@@ -113,9 +112,7 @@ my %CONFIGS = (
'ENV' => {
'NOCRYPT' => 'YES',
'NOLIBC_R' => 'YES',
- 'NOPERL' => 'YES',
'NOPROFILE' => 'YES',
- 'NOSECURE' => 'YES',
'NO_BIND' => 'YES',
'NO_FORTRAN' => 'YES',
'NO_SENDMAIL' => 'YES',
@@ -177,6 +174,7 @@ sub tinderbox($$$) {
# Fork and start the tinderbox
my @args = @{$CONFIG{'OPTIONS'}};
+ push(@args, "--sandbox=$CONFIG{'SANDBOX'}");
push(@args, "--branch=$branch");
push(@args, "--arch=$arch");
push(@args, "--machine=$machine");
@@ -255,7 +253,7 @@ sub tinderbox($$$) {
$recipient =~ s/\%\%arch\%\%/$arch/gi;
$recipient =~ s/\%\%machine\%\%/$machine/gi;
report(lc($recipient),
- "$branch tinderbox failure on $arch/$machine",
+ "[$CONFIG{'COMMENT'}] failure on $arch/$machine",
$summary);
}
OpenPOWER on IntegriCloud