2 files changed, 74 insertions, 290 deletions
diff --git a/tools/opttest.pl b/tools/opttest.pl
new file mode 100755
index 00000000..98213082
--- /dev/null
+++ b/tools/opttest.pl
@@ -0,0 +1,74 @@
+#!/usr/bin/perl -w
+use strict;
+use warnings;
+use Test;
+# This script (when executed from the monitoring plugins top level directory)
+# executes all the plugins with -h, --help, -V and --version to verify that
+# all of them exit properly with the state UNKNOWN (3)
+use vars qw($dir $file $prog $idx $state $output %progs @dirs);
+my $tests = 0;
+@dirs = qw(plugins plugins-scripts);
+foreach my $dir (@dirs) {
+        opendir(DIR, $dir) || die "can't opendir $dir: $!";
+        while ($file = readdir(DIR)) {
+                if (-x "$dir/$file" && -f "$dir/$file") {
+                        $tests++;
+                        $progs{"$dir/$file"} = $file;
+                }
+        }
+        closedir DIR;
+}
+plan tests => $tests;
+for my $prog (keys %progs) {
+        $state = 0;
+        $file = `basename $prog`;
+        $idx = 1;
+        $output = `$prog -h 2>&1`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (help exit code (short form))\n";
+                exit(1);
+        }
+        unless ($output =~ m/$progs{$prog}/ms) {
+                $idx++;
+                $state++;
+                print "$output\n$prog failed test $idx\n";
+        }
+        $idx++;
+        `$prog --help 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (help exit code (long form))\n";
+                exit(1);
+        }
+        $idx++;
+        `$prog -V 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (version exit code (short form))\n";
+                exit(1);
+        }
+        $idx++;
+        `$prog --version 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (version exit code (long form))\n";
+                exit(1);
+        }
+        print "$prog ($idx tests) ";
+        ok $state,0;
+}
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
deleted file mode 100755
index 1a41f577..00000000
--- a/tools/tinderbox_build
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/usr/bin/perl
-# tinderbox_build.pl
-# This script builds the monitoringplugins and then sends
-# logs back to the master tinderbox server
-#
-# This script is based on mozilla-unix.pl which comes with tinderbox2
-#
-# See http://tinderbox.altinity.org for more details
-require 5.000;
-use strict;
-use Sys::Hostname;
-use Cwd;
-use Time::Local;
-my $Version = `git describe --abbrev=4 HEAD`;
-my $myhost = hostname;
-chomp($myhost);
-my ($host, $junk) = split(/\./, $myhost);
-        
-my $BuildAdministrator = $ENV{TINDERBOX_BUILD_ADMIN} || "$ENV{'USER'}\@$myhost";
-my $TmpDir = $ENV{TMPDIR} || "/tmp";
-#Default values of cmdline opts
-my $ReportStatus = 0;  # Do not send results to server
-# Set these to what makes sense for your system
-# Set these proper values for your tinderbox server
-# 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 = 'monitoringplug';
-my $BuildName = '';
-my $ConfigureArgs = $ENV{CONFIGURE_ARGS};
-my $OS = `uname -s`;
-my $OSVer = `uname -r`;
-    
-chop($OS, $OSVer);
-    
-if ( $OS eq 'AIX' ) {
-        $OSVer = `uname -v`;
-        chop($OSVer);
-        $OSVer = $OSVer . "." . `uname -r`;
-        chop($OSVer);
-}
-        
-if ( $OS eq 'IRIX64' ) {
-        $OS = 'IRIX';
-}
-    
-if ( $OS eq 'SCO_SV' ) {
-        $OS = 'SCOOS';
-        $OSVer = '5.0';
-}
-    
-if ( "$host" ne "" ) {
-        $BuildName = $host . ' ';
-}
-$BuildName .= $OS . ' ' . $OSVer;
-$_ = $BuildName;
-s/ /_/g;
-my $logfile = "$_.log";
-sub BuildIt {
-        my ($fe, @felist, $EarlyExit, $LastTime);
-        my $StartDir = getcwd();
-        $LastTime = 0;
-        print "Starting dir is : $StartDir\n";
-        my $EarlyExit = 0;
-        chdir("$StartDir");
-        my $StartTime = time;
-        if (-e (my $file = "monitoring-plugins.spec")) {
-                open F, $file;
-                while (<F>) {
-                        if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-                                $StartTime = timegm(0, $5, $4, $3, ($2 - 1), ($1 - 1900));
-                                last;
-                        }
-                }
-        }
-        print "Start time is $StartTime",$/;
-        my $CurrentDir = getcwd();
-        if ( $CurrentDir ne $StartDir ) {
-                print "startdir: $StartDir, curdir $CurrentDir\n";
-                die "curdir != startdir";
-        }
-        unlink( "$logfile" );
-        
-        print "opening $logfile\n";
-        open( LOG, ">$logfile" ) || print "can't open $?\n";
-        print LOG "current dir is -- $host:$CurrentDir\n";
-        print LOG "Build Administrator is $BuildAdministrator\n";
-        &PrintEnv;
-        
-        my $BuildStatus;
-        if (&configure) {
-                if (&make) {
-                        if (&maketest) {
-                                $BuildStatus = "success";
-                        } else {        
-                                $BuildStatus = "test_failed";
-                        }
-                } else {
-                        $BuildStatus = "build_failed";
-                }
-        } else {
-                $BuildStatus = "busted";
-        }
-        print LOG "\nBuild Status = $BuildStatus\n";
-        close(LOG);
-        chdir("$StartDir");
-        
-# TV: Leaving this in, because process mail program probably has some
-# limitation retained
-# this fun line added on 2/5/98. do not remove. Translated to english,
-# that's "take any line longer than 1000 characters, and split it into less
-# than 1000 char lines.  If any of the resulting lines is
-# a dot on a line by itself, replace that with a blank line."  
-# This is to prevent cases where a <cr>.<cr> occurs in the log file.  Sendmail
-# interprets that as the end of the mail, and truncates the log before
-# it gets to Tinderbox.  (terry weismann, chris yeh)
-#
-# This was replaced by a perl 'port' of the above, written by 
-# preed@netscape.com; good things: no need for system() call, and now it's
-# all in perl, so we don't have to do OS checking like before.
-        open(LOG, "$logfile") || die "Couldn't open logfile: $!\n";
-        open(OUTLOG, ">${logfile}.last") || die "Couldn't open logfile: $!\n";
-            
-        print OUTLOG $/;
-        print OUTLOG "tinderbox: tree: $BuildTree\n";
-        print OUTLOG "tinderbox: builddate: $StartTime\n";
-        print OUTLOG "tinderbox: status: $BuildStatus\n";
-        print OUTLOG "tinderbox: build: $BuildName $fe\n";
-        print OUTLOG "tinderbox: errorparser: unix\n";
-        print OUTLOG "tinderbox: buildfamily: unix\n";
-        print OUTLOG "tinderbox: END\n";            
-        print OUTLOG $/;
-        while (<LOG>) {
-            my $q = 0;
-            
-            for (;;) {
-                my $val = $q * 1000;
-                my $Output = substr($_, $val, 1000);
-                
-                last if $Output eq undef;
-                
-                $Output =~ s/^\.$//g;
-                $Output =~ s/\n//g;
-                print OUTLOG "$Output\n";
-                $q++;
-            } #EndFor
-                
-        } #EndWhile
-            
-        close(LOG);
-        close(OUTLOG);
-        if ($ReportStatus) {
-                system( "ssh $Tinderbox_server tinderbox_receive < ${logfile}.last" )
-        } else {
-                print <<"EOF"
-Not sending logs to http://tinderbox.altinity.org
-If you have SSH keys setup on the tinderbox server, you can manually send
-with 'ssh $Tinderbox_server tinderbox_receive < ${logfile}.last'
-EOF
-        }
-        
-        unlink("$logfile");
-        print "Finished building for tinderbox",$/;
-} #EndSub-BuildIt
-sub ParseArgs {
-    my($i);
-    $i = 0;
-    while( $i < @ARGV ) {
-        if ($ARGV[$i] eq '--version' || $ARGV[$i] eq '-v') {
-            die "$0: version $Version\n";
-        } elsif ($ARGV[$i] eq '-y') {
-                $ReportStatus = 1;
-        } else {
-            &PrintUsage;
-        }
-        $i++;
-    } #EndWhile
-} #EndSub-ParseArgs
-sub PrintUsage {
-    die "usage: $0 [-v | --version ] [-t do not send report to tinderbox server]\n";
-}
-sub PrintEnv {
-    my ($key);
-    foreach $key (keys %ENV) {
-        print LOG "$key = $ENV{$key}\n";
-        print "$key = $ENV{$key}\n";
-    }
-        # Print the NPTest variables
-        if (-e "/var/tmp/NPTest.cache") {
-                open F, "/var/tmp/NPTest.cache";
-                print LOG "NPTest variables:\n";
-                print LOG <F>;
-                close F;
-        }
-                
-} #EndSub-PrintEnv
-sub SetupPath {
-    my($Path);
-    $Path = $ENV{PATH};
-    print "Path before: $Path\n";
-    # 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};
-    print "Path After: $Path\n";
-} #EndSub-SetupPath
-sub configure {
-        # Configure
-        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 $_;
-        }
-        close(CONFIGURE);
-        return ! $?;
-}
-        
-sub make {
-        # Building
-        print LOG "make 2>&1\n";
-        open( MAKE, "make 2>&1 |");
-        while ( <MAKE> ) {
-                print $_;
-                print LOG $_;
-        }
-        close( MAKE);
-        return ! $?;
-}
-sub maketest {
-        # Tests
-        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 $_;
-        }
-        close( MAKE);
-        my $rc = $?;
-        system("rm -fr $TmpDir/tinderbox_build.$$ $TmpDir/tinderbox_build2.$$");
-        return ! $rc;
-}
-# Main function
-&ParseArgs;
-&SetupPath;
-&BuildIt;
-1;

diff --git a/tools/opttest.pl b/tools/opttest.pl new file mode 100755 index 00000000..98213082 --- /dev/null +++ b/tools/opttest.pl
@@ -0,0 +1,74 @@
		1	#!/usr/bin/perl -w
		2	use strict;
		3	use warnings;
		4	use Test;
		5
		6	# This script (when executed from the monitoring plugins top level directory)
		7	# executes all the plugins with -h, --help, -V and --version to verify that
		8	# all of them exit properly with the state UNKNOWN (3)
		9
		10	use vars qw($dir $file $prog $idx $state $output %progs @dirs);
		11
		12	my $tests = 0;
		13
		14	@dirs = qw(plugins plugins-scripts);
		15
		16	foreach my $dir (@dirs) {
		17	opendir(DIR, $dir) \|\| die "can't opendir $dir: $!";
		18	while ($file = readdir(DIR)) {
		19	if (-x "$dir/$file" && -f "$dir/$file") {
		20	$tests++;
		21	$progs{"$dir/$file"} = $file;
		22	}
		23	}
		24	closedir DIR;
		25	}
		26
		27	plan tests => $tests;
		28
		29	for my $prog (keys %progs) {
		30	$state = 0;
		31	$file = `basename $prog`;
		32
		33	$idx = 1;
		34	$output = `$prog -h 2>&1`;
		35	if(($? >> 8) != 3) {
		36	$state++;
		37	print "$prog failed test $idx (help exit code (short form))\n";
		38	exit(1);
		39	}
		40
		41	unless ($output =~ m/$progs{$prog}/ms) {
		42	$idx++;
		43	$state++;
		44	print "$output\n$prog failed test $idx\n";
		45	}
		46
		47	$idx++;
		48	`$prog --help 2>&1 > /dev/null`;
		49	if(($? >> 8) != 3) {
		50	$state++;
		51	print "$prog failed test $idx (help exit code (long form))\n";
		52	exit(1);
		53	}
		54
		55	$idx++;
		56	`$prog -V 2>&1 > /dev/null`;
		57	if(($? >> 8) != 3) {
		58	$state++;
		59	print "$prog failed test $idx (version exit code (short form))\n";
		60	exit(1);
		61	}
		62
		63	$idx++;
		64	`$prog --version 2>&1 > /dev/null`;
		65	if(($? >> 8) != 3) {
		66	$state++;
		67	print "$prog failed test $idx (version exit code (long form))\n";
		68	exit(1);
		69	}
		70
		71	print "$prog ($idx tests) ";
		72	ok $state,0;
		73	}
		74


diff --git a/tools/tinderbox_build b/tools/tinderbox_build deleted file mode 100755 index 1a41f577..00000000 --- a/tools/tinderbox_build +++ /dev/null
@@ -1,290 +0,0 @@
1	#!/usr/bin/perl
2	# tinderbox_build.pl
3	# This script builds the monitoringplugins and then sends
4	# logs back to the master tinderbox server
5	#
6	# This script is based on mozilla-unix.pl which comes with tinderbox2
7	#
8	# See http://tinderbox.altinity.org for more details
9
10	require 5.000;
11
12	use strict;
13	use Sys::Hostname;
14	use Cwd;
15	use Time::Local;
16
17	my $Version = `git describe --abbrev=4 HEAD`;
18
19	my $myhost = hostname;
20	chomp($myhost);
21	my ($host, $junk) = split(/\./, $myhost);
22
23	my $BuildAdministrator = $ENV{TINDERBOX_BUILD_ADMIN} \|\| "$ENV{'USER'}\@$myhost";
24	my $TmpDir = $ENV{TMPDIR} \|\| "/tmp";
25
26	#Default values of cmdline opts
27	my $ReportStatus = 0; # Do not send results to server
28
29	# Set these to what makes sense for your system
30
31	# Set these proper values for your tinderbox server
32	# Have the StrictHostKeyChecking=no so that a new host will automatically add hostkey without
33	# prompting. If host key changes, then will get error, so this should still be secure
34	my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com';
35
36	# These shouldn't really need to be changed
37	my $BuildTree = 'monitoringplug';
38	my $BuildName = '';
39	my $ConfigureArgs = $ENV{CONFIGURE_ARGS};
40
41	my $OS = `uname -s`;
42	my $OSVer = `uname -r`;
43
44	chop($OS, $OSVer);
45
46	if ( $OS eq 'AIX' ) {
47	$OSVer = `uname -v`;
48	chop($OSVer);
49	$OSVer = $OSVer . "." . `uname -r`;
50	chop($OSVer);
51	}
52
53	if ( $OS eq 'IRIX64' ) {
54	$OS = 'IRIX';
55	}
56
57	if ( $OS eq 'SCO_SV' ) {
58	$OS = 'SCOOS';
59	$OSVer = '5.0';
60	}
61
62	if ( "$host" ne "" ) {
63	$BuildName = $host . ' ';
64	}
65	$BuildName .= $OS . ' ' . $OSVer;
66	$_ = $BuildName;
67	s/ /_/g;
68
69	my $logfile = "$_.log";
70
71	sub BuildIt {
72	my ($fe, @felist, $EarlyExit, $LastTime);
73
74	my $StartDir = getcwd();
75	$LastTime = 0;
76
77	print "Starting dir is : $StartDir\n";
78
79	my $EarlyExit = 0;
80
81	chdir("$StartDir");
82
83	my $StartTime = time;
84	if (-e (my $file = "monitoring-plugins.spec")) {
85	open F, $file;
86	while (<F>) {
87	if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
88	$StartTime = timegm(0, $5, $4, $3, ($2 - 1), ($1 - 1900));
89	last;
90	}
91	}
92	}
93
94	print "Start time is $StartTime",$/;
95
96	my $CurrentDir = getcwd();
97	if ( $CurrentDir ne $StartDir ) {
98	print "startdir: $StartDir, curdir $CurrentDir\n";
99	die "curdir != startdir";
100	}
101
102	unlink( "$logfile" );
103
104	print "opening $logfile\n";
105	open( LOG, ">$logfile" ) \|\| print "can't open $?\n";
106	print LOG "current dir is -- $host:$CurrentDir\n";
107	print LOG "Build Administrator is $BuildAdministrator\n";
108	&PrintEnv;
109
110	my $BuildStatus;
111	if (&configure) {
112	if (&make) {
113	if (&maketest) {
114	$BuildStatus = "success";
115	} else {
116	$BuildStatus = "test_failed";
117	}
118	} else {
119	$BuildStatus = "build_failed";
120	}
121	} else {
122	$BuildStatus = "busted";
123	}
124
125	print LOG "\nBuild Status = $BuildStatus\n";
126
127	close(LOG);
128	chdir("$StartDir");
129
130	# TV: Leaving this in, because process mail program probably has some
131	# limitation retained
132
133	# this fun line added on 2/5/98. do not remove. Translated to english,
134	# that's "take any line longer than 1000 characters, and split it into less
135	# than 1000 char lines. If any of the resulting lines is
136	# a dot on a line by itself, replace that with a blank line."
137	# This is to prevent cases where a <cr>.<cr> occurs in the log file. Sendmail
138	# interprets that as the end of the mail, and truncates the log before
139	# it gets to Tinderbox. (terry weismann, chris yeh)
140	#
141	# This was replaced by a perl 'port' of the above, written by
142	# preed@netscape.com; good things: no need for system() call, and now it's
143	# all in perl, so we don't have to do OS checking like before.
144
145	open(LOG, "$logfile") \|\| die "Couldn't open logfile: $!\n";
146	open(OUTLOG, ">${logfile}.last") \|\| die "Couldn't open logfile: $!\n";
147
148	print OUTLOG $/;
149	print OUTLOG "tinderbox: tree: $BuildTree\n";
150	print OUTLOG "tinderbox: builddate: $StartTime\n";
151	print OUTLOG "tinderbox: status: $BuildStatus\n";
152	print OUTLOG "tinderbox: build: $BuildName $fe\n";
153	print OUTLOG "tinderbox: errorparser: unix\n";
154	print OUTLOG "tinderbox: buildfamily: unix\n";
155	print OUTLOG "tinderbox: END\n";
156	print OUTLOG $/;
157
158	while (<LOG>) {
159	my $q = 0;
160
161	for (;;) {
162	my $val = $q * 1000;
163	my $Output = substr($_, $val, 1000);
164
165	last if $Output eq undef;
166
167	$Output =~ s/^\.$//g;
168	$Output =~ s/\n//g;
169	print OUTLOG "$Output\n";
170	$q++;
171	} #EndFor
172
173	} #EndWhile
174
175	close(LOG);
176	close(OUTLOG);
177
178	if ($ReportStatus) {
179	system( "ssh $Tinderbox_server tinderbox_receive < ${logfile}.last" )
180	} else {
181	print <<"EOF"
182	Not sending logs to http://tinderbox.altinity.org
183	If you have SSH keys setup on the tinderbox server, you can manually send
184	with 'ssh $Tinderbox_server tinderbox_receive < ${logfile}.last'
185	EOF
186	}
187
188	unlink("$logfile");
189	print "Finished building for tinderbox",$/;
190
191	} #EndSub-BuildIt
192
193	sub ParseArgs {
194	my($i);
195
196	$i = 0;
197	while( $i < @ARGV ) {
198	if ($ARGV[$i] eq '--version' \|\| $ARGV[$i] eq '-v') {
199	die "$0: version $Version\n";
200	} elsif ($ARGV[$i] eq '-y') {
201	$ReportStatus = 1;
202	} else {
203	&PrintUsage;
204	}
205
206	$i++;
207	} #EndWhile
208
209	} #EndSub-ParseArgs
210
211	sub PrintUsage {
212	die "usage: $0 [-v \| --version ] [-t do not send report to tinderbox server]\n";
213	}
214
215	sub PrintEnv {
216	my ($key);
217	foreach $key (keys %ENV) {
218	print LOG "$key = $ENV{$key}\n";
219	print "$key = $ENV{$key}\n";
220	}
221
222	# Print the NPTest variables
223	if (-e "/var/tmp/NPTest.cache") {
224	open F, "/var/tmp/NPTest.cache";
225	print LOG "NPTest variables:\n";
226	print LOG <F>;
227	close F;
228	}
229
230	} #EndSub-PrintEnv
231
232	sub SetupPath {
233	my($Path);
234	$Path = $ENV{PATH};
235	print "Path before: $Path\n";
236
237	# Don't alter path if we're building off a repository tree;
238	# SunOS make will be used only for snapshots and releases.
239	if ( $OS eq 'SunOS' && !( -e '.svn' \|\| -e '.git' )) {
240	$ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
241	}
242
243	$Path = $ENV{PATH};
244	print "Path After: $Path\n";
245	} #EndSub-SetupPath
246
247	sub configure {
248	# Configure
249	print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1\n";
250	open (CONFIGURE, "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1 \|") \|\| die "../configure: $!\n";
251	while (<CONFIGURE>) {
252	print $_;
253	print LOG $_;
254	}
255	close(CONFIGURE);
256	return ! $?;
257	}
258
259	sub make {
260	# Building
261	print LOG "make 2>&1\n";
262	open( MAKE, "make 2>&1 \|");
263	while ( <MAKE> ) {
264	print $_;
265	print LOG $_;
266	}
267	close( MAKE);
268	return ! $?;
269	}
270
271	sub maketest {
272	# Tests
273	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";
274	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 \|");
275	while ( <MAKE> ) {
276	print $_;
277	print LOG $_;
278	}
279	close( MAKE);
280	my $rc = $?;
281	system("rm -fr $TmpDir/tinderbox_build.$$ $TmpDir/tinderbox_build2.$$");
282	return ! $rc;
283	}
284
285	# Main function
286	&ParseArgs;
287	&SetupPath;
288	&BuildIt;
289
290	1;