summaryrefslogtreecommitdiffstats
path: root/test.pl.in
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2014-01-31 08:54:44 -0500
committerThomas Guyot-Sionnest <dermoth@aei.ca>2014-01-31 08:54:44 -0500
commit1dd0e4c96376f2c28590dad683161ee8c57c0508 (patch)
tree4a61176ad008db3d6c835393d6a1332453d297e1 /test.pl.in
parent35811848da1095525e6937159f6611fc8a87261b (diff)
downloadmonitoring-plugins-1dd0e4c96376f2c28590dad683161ee8c57c0508.tar.gz
Enable tests in tests/ subdirs
Diffstat (limited to 'test.pl.in')
-rwxr-xr-xtest.pl.in13
1 files changed, 8 insertions, 5 deletions
diff --git a/test.pl.in b/test.pl.in
index 85ac19da..01a97ec0 100755
--- a/test.pl.in
+++ b/test.pl.in
@@ -9,9 +9,9 @@ use Getopt::Long;
9 9
10use NPTest qw(DetermineTestHarnessDirectory TestsFrom); 10use NPTest qw(DetermineTestHarnessDirectory TestsFrom);
11 11
12my $tstdir; 12my @tstdir;
13 13
14if ( ! GetOptions( "testdir:s" => \$tstdir ) ) 14if ( ! GetOptions( "testdir:s" => \@tstdir ) )
15{ 15{
16 print "Usage: ${0} [--testdir=<directory>] [<test_harness.t> ...]\n"; 16 print "Usage: ${0} [--testdir=<directory>] [<test_harness.t> ...]\n";
17 exit 1; 17 exit 1;
@@ -25,15 +25,18 @@ if ( scalar( @ARGV ) )
25} 25}
26else 26else
27{ 27{
28 my $directory = DetermineTestHarnessDirectory( $tstdir ); 28 my @directory = DetermineTestHarnessDirectory( @tstdir );
29 29
30 if ( !defined( $directory ) ) 30 if ( @directory == 0 )
31 { 31 {
32 print STDERR "$0: Unable to determine the test harness directory - ABORTING\n"; 32 print STDERR "$0: Unable to determine the test harness directory - ABORTING\n";
33 exit 2; 33 exit 2;
34 } 34 }
35 35
36 @tests = TestsFrom( $directory, 1 ); 36 for my $d ( @directory )
37 {
38 push (@tests, TestsFrom( $d, 1 ));
39 }
37} 40}
38 41
39if ( ! scalar( @tests ) ) 42if ( ! scalar( @tests ) )