diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 7222324a10986dd74cd31a354345b97aac73b599..12528d9ba400ee8203f58365ba6508243de6b9e9 100755 (executable)
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
use Cwd;
use Time::Local;
-my $Version = '$Revision$';
+my $Version = `git describe --abbrev=4 HEAD`;
my $myhost = hostname;
chomp($myhost);
# Set these to what makes sense for your system
# Set these proper values for your tinderbox server
-my $Tinderbox_server = 'tinderbox2@tinderbox.altinity.org';
+# Have the StrictHostKeyChecking=no so that a new host will automatically add hostkey without
+# prompting. If host key changes, then will get error, so this should still be secure
+my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com';
# These shouldn't really need to be changed
my $BuildTree = 'nagiosplug';
$Path = $ENV{PATH};
print "Path before: $Path\n";
- if ( $OS eq 'SunOS' ) {
- $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
+ # Don't alter path if we're building off a repository tree;
+ # SunOS make will be used only for snapshots and releases.
+ if ( $OS eq 'SunOS' && !( -e '.svn' || -e '.git' )) {
+ $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
}
$Path = $ENV{PATH};
sub configure {
# Configure
- print LOG "./configure $ConfigureArgs\n";
- open (CONFIGURE, "./configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
+ print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1\n";
+ open (CONFIGURE, "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
while (<CONFIGURE>) {
print $_;
print LOG $_;
sub maketest {
# Tests
- print LOG "LANG=C make test 2>&1\n";
- open( MAKE, "LANG=C make test && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
+ print LOG "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1\n";
+ open( MAKE, "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
while ( <MAKE> ) {
print $_;
print LOG $_;