diff options
| author | des <des@FreeBSD.org> | 2004-01-23 23:06:14 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-01-23 23:06:14 +0000 |
| commit | a5a50a7fe7b8830d87b650180c33d269a95c61c7 (patch) | |
| tree | a86fac65dfe85a37a1bab1b5191a91187c53a588 /tools | |
| parent | 0f35d83c085f980b1bdc24796ea6f703dd3a85a8 (diff) | |
| download | FreeBSD-src-a5a50a7fe7b8830d87b650180c33d269a95c61c7.zip FreeBSD-src-a5a50a7fe7b8830d87b650180c33d269a95c61c7.tar.gz | |
Add support for tinderbox.pl's --cvsup and --repository options.
Sort %CONFIG.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/tinderbox/tbmaster.pl | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl index ac68506..246bbb9 100644 --- a/tools/tools/tinderbox/tbmaster.pl +++ b/tools/tools/tinderbox/tbmaster.pl @@ -44,20 +44,22 @@ my $dump; # Dump configuration and exit my $etcdir; # Configuration directory my %CONFIG = ( - 'COMMENT' => '', 'BRANCHES' => [ 'CURRENT' ], - 'PLATFORMS' => [ 'i386' ], + 'COMMENT' => '', + 'CVSUP' => '', 'DATE' => '', - 'SANDBOX' => '/tmp/tinderbox', + 'ENV' => [], 'HOSTNAME' => '', 'LOGDIR' => '%%SANDBOX%%/logs', - 'TARGETS' => [ 'update', 'world' ], 'OPTIONS' => [], 'PATCH' => '', - 'ENV' => [], - 'SENDER' => '', + 'PLATFORMS' => [ 'i386' ], 'RECIPIENT' => '', + 'REPOSITORY'=> '', + 'SANDBOX' => '/tmp/tinderbox', + 'SENDER' => '', 'SUBJECT' => 'Tinderbox failure on %%arch%%/%%machine%%', + 'TARGETS' => [ 'update', 'world' ], 'TINDERBOX' => '%%HOME%%/tinderbox', ); @@ -224,9 +226,13 @@ sub tinderbox($$$) { push(@args, "--hostname=" . expand('HOSTNAME')) if ($CONFIG{'HOSTNAME'}); push(@args, "--sandbox=" . expand('SANDBOX')); - push(@args, "--branch=$branch"); push(@args, "--arch=$arch"); push(@args, "--machine=$machine"); + push(@args, "--cvsup=" . expand('CVSUP')) + if ($CONFIG{'CVSUP'}); + push(@args, "--repository=" . expand('REPOSITORY')) + if ($CONFIG{'REPOSITORY'}); + push(@args, "--branch=$branch"); push(@args, "--date=" . expand('DATE')) if ($CONFIG{'DATE'}); push(@args, "--patch=" . expand('PATCH')) |
