From f278c817e584ac7ccd3bdfee3daefdbc483398b7 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Thu, 3 Nov 2005 15:04:16 +0000 Subject: Fixing some test failures git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1270 f882894a-f735-0410-b71e-b25c423dba1c --- NPTest.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'NPTest.pm') diff --git a/NPTest.pm b/NPTest.pm index 201bc6ae..8f20678b 100644 --- a/NPTest.pm +++ b/NPTest.pm @@ -88,7 +88,7 @@ typical tests we wish to perform are against the exit status of the command and the output (if any) it generated. Simplifying these tests into a single function call, makes the test harness easier to read and maintain and allows additional functionality (such as debugging) to be -provided withoutadditional effort on the part of the test harness +provided without additional effort on the part of the test harness developer. It is possible to enable debugging via the environment variable @@ -264,6 +264,7 @@ sub checkCmd if ( %exceptions && exists( $exceptions{$exitStatus} ) ) { $testStatus += skip( $exceptions{$exitStatus}, $exitStatus, $desiredExitStatus ); + $testOutput = "skip"; } else { @@ -312,7 +313,7 @@ sub getTestParameter if ( defined( $envvar ) && exists( $ENV{$envvar} ) && $ENV{$envvar} ) { - return $ENV{$envvar} + return $ENV{$envvar}; } my $cachedValue = SearchCache( $param, $testharness ); -- cgit v1.2.3