1 files changed, 13 insertions, 40 deletions

diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t
index da49ac61..cb5f1224 100644
--- a/plugins/t/check_procs.t
+++ b/plugins/t/check_procs.t
@@ -1,51 +1,24 @@
-#! /usr/bin/perl -w
+#! /usr/bin/perl -w -I ..
+#
+# Process Tests via check_procs
+#
+# $Id$
+#
 
 use strict;
-use Cache;
 use Test;
-use vars qw($tests);
+use NPTest;
 
+use vars qw($tests);
 BEGIN {$tests = 10; plan tests => $tests}
 
-my $null = '';
-my $cmd;
-my $str;
 my $t;
 
-# Reverse Compatibility
-$cmd = "./check_procs -w 100000 -c 100000";
-$str = `$cmd`;
-$t += ok $?>>8,0;
-print "Test was: $cmd\n" if ($?);
-$t += ok $str, '/^PROCS OK: [0-9]+ process(es)?$/';
-
-# Reverse Compatibility
-$cmd = "./check_procs -w 100000 -c 100000 -s Z";
-$str = `$cmd`;
-$t += ok $?>>8,0;
-print "Test was: $cmd\n" if ($?);
-$t += ok $str, '/^PROCS OK: [0-9]+ process(es)? with /';
-
-# Reverse Compatibility
-$cmd = "./check_procs -w 0 -c 10000000";
-$str = `$cmd`;
-$t += ok $?>>8,1;
-print "Test was: $cmd\n" unless ($?);
-$t += ok $str, '/^PROCS WARNING: [0-9]+ process(es)?$/';
-
-# Reverse Compatibility
-$cmd = "./check_procs -w 0 -c 0";
-$str = `$cmd`;
-$t += ok $?>>8,2;
-print "Test was: $cmd\n" unless ($?);
-$t += ok $str, '/^PROCS CRITICAL: [0-9]+ process(es)?$/';
-
-# Reverse Compatibility
-$cmd = "./check_procs -w 0 -c 0 -s S";
-$str = `$cmd`;
-$t += ok $?>>8,2;
-print "Test was: $cmd\n" unless ($?);
-$t += ok $str, '/^PROCS CRITICAL: [0-9]+ process(es)? with /';
+$t += checkCmd( "./check_procs -w 100000 -c   100000",      0, '/^PROCS OK: [0-9]+ process(es)?$/' );
+$t += checkCmd( "./check_procs -w 100000 -c   100000 -s Z", 0, '/^PROCS OK: [0-9]+ process(es)? with /' );
+$t += checkCmd( "./check_procs -w      0 -c 10000000",      1, '/^PROCS WARNING: [0-9]+ process(es)?$/' );
+$t += checkCmd( "./check_procs -w 0      -c        0",      2, '/^PROCS CRITICAL: [0-9]+ process(es)?$/' );
+$t += checkCmd( "./check_procs -w 0      -c        0 -s S", 2, '/^PROCS CRITICAL: [0-9]+ process(es)? with /' );
 
 exit(0) if defined($Test::Harness::VERSION);
 exit($tests - $t);