[Nagiosplug-checkins] SF.net SVN: nagiosplug: [1957] nagiosplug/branches/new_threshold_syntax

[tonvoon at users.sourceforge.net]

Revision: 1957
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1957&view=rev
Author:   tonvoon
Date:     2008-03-19 07:38:56 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------
Remove base64 tests, since base64 comes from gnulib now

Modified Paths:
--------------
    nagiosplug/branches/new_threshold_syntax/configure.in
    nagiosplug/branches/new_threshold_syntax/lib/tests/Makefile.am

Modified: nagiosplug/branches/new_threshold_syntax/configure.in
===================================================================
--- nagiosplug/branches/new_threshold_syntax/configure.in	2008-03-19 14:37:15 UTC (rev 1956)
+++ nagiosplug/branches/new_threshold_syntax/configure.in	2008-03-19 14:38:56 UTC (rev 1957)
@@ -156,7 +156,7 @@
 
 dnl Check for libtap, to run perl-like tests
 AC_CHECK_LIB(tap, plan_tests, 
-	EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
+	EXTRA_TEST="test_utils test_disk test_tcp test_cmd"
 	AC_SUBST(EXTRA_TEST)
 	)
 
@@ -566,6 +566,7 @@
 	ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'"
 	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
 	ac_cv_ps_cols=9
+	ac_cv_ps_test="ps_axwo.debian"
 	AC_MSG_RESULT([$ac_cv_ps_command])
 
 dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
@@ -578,6 +579,7 @@
 	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
 	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
 	ac_cv_ps_cols=9
+	ac_cv_ps_test="ps-axwo.darwin"
 	AC_MSG_RESULT([$ac_cv_ps_command])
 
 dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. 
@@ -808,6 +810,8 @@
 		[Format string for scanning ps output in check_procs])
 	AC_DEFINE_UNQUOTED(PS_COLS,$ac_cv_ps_cols,
 		[Number of columns in ps command])
+	AC_DEFINE_UNQUOTED(PS_TEST,$ac_cv_ps_test,
+		[Test file to check parsing])
 	EXTRAS="$EXTRAS check_procs check_nagios"
 	if echo "$ac_cv_ps_varlist" | grep "procetime" >/dev/null; then
 		AC_DEFINE(PS_USES_PROCETIME,"yes",

Modified: nagiosplug/branches/new_threshold_syntax/lib/tests/Makefile.am
===================================================================
--- nagiosplug/branches/new_threshold_syntax/lib/tests/Makefile.am	2008-03-19 14:37:15 UTC (rev 1956)
+++ nagiosplug/branches/new_threshold_syntax/lib/tests/Makefile.am	2008-03-19 14:38:56 UTC (rev 1957)
@@ -7,9 +7,9 @@
 
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64
+EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd
 
-EXTRA_DIST = test_utils.t test_disk.t test_tcp.t test_cmd.t test_base64.t
+EXTRA_DIST = test_utils.t test_disk.t test_tcp.t test_cmd.t
 
 LIBS = @LIBINTL@
 
@@ -33,11 +33,6 @@
 test_cmd_LDFLAGS = -L/usr/local/lib -ltap
 test_cmd_LDADD = ../utils_cmd.o ../utils_base.o
 
-test_base64_SOURCES = test_base64.c
-test_base64_CFLAGS = -g -I..
-test_base64_LDFLAGS = -L/usr/local/lib -ltap
-test_base64_LDADD = $(top_srcdir)/gl/base64.o 
-
 test: ${noinst_PROGRAMS}
 	perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.