[Nagiosplug-checkins] nagiosplug test.pl.in,1.1.1.1,1.2

[Matthew Kent]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27374

Modified Files:
	test.pl.in 
Log Message:
Updating test harness


Index: test.pl.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/test.pl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- test.pl.in	28 Feb 2002 06:42:53 -0000	1.1.1.1
+++ test.pl.in	25 Nov 2004 05:06:24 -0000	1.2
@@ -14,14 +14,16 @@
 }
 
 use Helper;
-my ($tstdir,$spath,$hostname,$mailhost,$noserver,$nullhost,$quickcheck);
+my ($tstdir,$spath,$hostname,$httphost,$mailhost,$dnshost,$noserver,$nullhost,$quickcheck);
 
 use Getopt::Long;
 GetOptions
 	("tstdir:s"=>\$tstdir,
 	 "spath:s"=>\$spath,
 	 "hostname:s"=>\$hostname,
+	 "httpname:s"=>\$httphost,
 	 "mailhost:s"=>\$mailhost,
+	 "dnshost:s"=>\$dnshost,
 	 "noserver:s"=>\$noserver,
 	 "nullhost:s"=>\$nullhost,
 	 "quickcheck"=>\$quickcheck);
@@ -30,8 +32,10 @@
 
 unless ($quickcheck) {
     
-	$hostname = get_option("hostname","host for FTP/HTTP/UDP tests")	unless ($hostname);
+	$hostname = get_option("hostname","host for FTP/UDP tests")		unless ($hostname);
+	$httphost = get_option("httphost","host for HTTP tests")		unless ($httphost);
 	$mailhost = get_option("mailhost","host for SMTP/IMAP/POP tests")	unless ($mailhost);
+	$dnshost  = get_option("dnshost","hostname to lookup for DNS tests")	unless ($dnshost);
 	$noserver = get_option("noserver","host that rejects above services")	unless ($noserver);
 	# This machine should not be locatable from your network.  Use IP
 	# private addresses like 10.x.x.x and pick one that does not exist