upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-06-03 13:59:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove base64 tests, since base64 comes from gnulib now

Browse source 
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/branches/new_threshold_syntax@1957 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Ton Voon 2008-03-19 14:38:56 +00:00
parent a88ec0cc5c
commit cab9440a67
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.in
View file

@ -156,7 +156,7 @@ AC_SUBST(MATHLIBS)
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 @@ then
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 @@ then
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 @@ if test -n "$ac_cv_ps_varlist" ; then
[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",

9
lib/tests/Makefile.am
View file

@ -7,9 +7,9 @@ check_PROGRAMS = @EXTRA_TEST@
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_CFLAGS = -g -I..
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)