Imported Upstream version 1.4.13+git200906171200
This commit is contained in:
parent
4ab9f0d24c
commit
d0b8ab8112
362 changed files with 34110 additions and 10773 deletions
|
|
@ -7,48 +7,28 @@ 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 test_ini test_opts
|
||||
EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3
|
||||
|
||||
np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini.t test_opts.t test_tcp.t test_utils.t
|
||||
np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t
|
||||
np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini
|
||||
EXTRA_DIST = $(np_test_scripts) $(np_test_files)
|
||||
|
||||
LIBS = @LIBINTL@
|
||||
LIBS = @LTLIBINTL@
|
||||
|
||||
test_utils_SOURCES = test_utils.c
|
||||
test_utils_CFLAGS = -g -I..
|
||||
test_utils_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_utils_LDADD = ../utils_base.o
|
||||
if USE_LIBTAP_LOCAL
|
||||
tap_cflags = -I$(top_srcdir)/tap
|
||||
tap_ldflags = -L$(top_srcdir)/tap
|
||||
tap_ldadd = $(top_srcdir)/gl/libgnu.a
|
||||
else
|
||||
## Shouldn't we detect that??
|
||||
tap_ldflags = -L/usr/local/lib
|
||||
endif
|
||||
|
||||
test_disk_SOURCES = test_disk.c
|
||||
test_disk_CFLAGS = -g -I..
|
||||
test_disk_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a
|
||||
AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
|
||||
AM_LDFLAGS = $(tap_ldflags) -ltap
|
||||
LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a
|
||||
|
||||
test_tcp_SOURCES = test_tcp.c
|
||||
test_tcp_CFLAGS = -g -I..
|
||||
test_tcp_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_tcp_LDADD = ../utils_tcp.o
|
||||
|
||||
test_cmd_SOURCES = test_cmd.c
|
||||
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_ini_SOURCES = test_ini.c
|
||||
test_ini_CFLAGS = -g -I..
|
||||
test_ini_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_ini_LDADD = ../utils_base.o ../parse_ini.o
|
||||
|
||||
test_opts_SOURCES = test_opts.c
|
||||
test_opts_CFLAGS = -g -I..
|
||||
test_opts_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_opts_LDADD = ../utils_base.o ../parse_ini.o ../extra_opts.o
|
||||
SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
|
||||
|
||||
test: ${noinst_PROGRAMS}
|
||||
perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
|
||||
|
|
|
|||
|
|
@ -39,22 +39,25 @@ noinst_PROGRAMS = @EXTRA_TEST@
|
|||
check_PROGRAMS = @EXTRA_TEST@
|
||||
EXTRA_PROGRAMS = test_utils$(EXEEXT) test_disk$(EXEEXT) \
|
||||
test_tcp$(EXEEXT) test_cmd$(EXEEXT) test_base64$(EXEEXT) \
|
||||
test_ini$(EXEEXT) test_opts$(EXEEXT)
|
||||
test_ini1$(EXEEXT) test_ini3$(EXEEXT) test_opts1$(EXEEXT) \
|
||||
test_opts2$(EXEEXT) test_opts3$(EXEEXT)
|
||||
subdir = lib/tests
|
||||
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
|
||||
$(top_srcdir)/gl/m4/alloca.m4 \
|
||||
$(top_srcdir)/gl/m4/00gnulib.m4 $(top_srcdir)/gl/m4/alloca.m4 \
|
||||
$(top_srcdir)/gl/m4/arpa_inet_h.m4 \
|
||||
$(top_srcdir)/gl/m4/base64.m4 $(top_srcdir)/gl/m4/c-strtod.m4 \
|
||||
$(top_srcdir)/gl/m4/cloexec.m4 $(top_srcdir)/gl/m4/codeset.m4 \
|
||||
$(top_srcdir)/gl/m4/dirname.m4 $(top_srcdir)/gl/m4/dos.m4 \
|
||||
$(top_srcdir)/gl/m4/base64.m4 $(top_srcdir)/gl/m4/btowc.m4 \
|
||||
$(top_srcdir)/gl/m4/c-strtod.m4 $(top_srcdir)/gl/m4/cloexec.m4 \
|
||||
$(top_srcdir)/gl/m4/codeset.m4 $(top_srcdir)/gl/m4/dirname.m4 \
|
||||
$(top_srcdir)/gl/m4/dos.m4 \
|
||||
$(top_srcdir)/gl/m4/double-slash-root.m4 \
|
||||
$(top_srcdir)/gl/m4/eoverflow.m4 $(top_srcdir)/gl/m4/error.m4 \
|
||||
$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
|
||||
$(top_srcdir)/gl/m4/exitfail.m4 \
|
||||
$(top_srcdir)/gl/m4/extensions.m4 \
|
||||
$(top_srcdir)/gl/m4/fcntl-safer.m4 \
|
||||
$(top_srcdir)/gl/m4/float_h.m4 $(top_srcdir)/gl/m4/floorf.m4 \
|
||||
$(top_srcdir)/gl/m4/fcntl_h.m4 $(top_srcdir)/gl/m4/float_h.m4 \
|
||||
$(top_srcdir)/gl/m4/floorf.m4 \
|
||||
$(top_srcdir)/gl/m4/fstypename.m4 \
|
||||
$(top_srcdir)/gl/m4/fsusage.m4 \
|
||||
$(top_srcdir)/gl/m4/getaddrinfo.m4 \
|
||||
|
|
@ -64,7 +67,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
|
|||
$(top_srcdir)/gl/m4/glibc21.m4 \
|
||||
$(top_srcdir)/gl/m4/gnulib-common.m4 \
|
||||
$(top_srcdir)/gl/m4/gnulib-comp.m4 \
|
||||
$(top_srcdir)/gl/m4/iconv.m4 \
|
||||
$(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \
|
||||
$(top_srcdir)/gl/m4/include_next.m4 \
|
||||
$(top_srcdir)/gl/m4/inet_ntop.m4 $(top_srcdir)/gl/m4/inline.m4 \
|
||||
$(top_srcdir)/gl/m4/intlmacosx.m4 \
|
||||
|
|
@ -73,17 +76,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
|
|||
$(top_srcdir)/gl/m4/lib-ld.m4 $(top_srcdir)/gl/m4/lib-link.m4 \
|
||||
$(top_srcdir)/gl/m4/lib-prefix.m4 \
|
||||
$(top_srcdir)/gl/m4/localcharset.m4 \
|
||||
$(top_srcdir)/gl/m4/locale-fr.m4 \
|
||||
$(top_srcdir)/gl/m4/locale-ja.m4 \
|
||||
$(top_srcdir)/gl/m4/locale-zh.m4 \
|
||||
$(top_srcdir)/gl/m4/longlong.m4 \
|
||||
$(top_srcdir)/gl/m4/ls-mntd-fs.m4 \
|
||||
$(top_srcdir)/gl/m4/malloc.m4 $(top_srcdir)/gl/m4/math_h.m4 \
|
||||
$(top_srcdir)/gl/m4/mbstate_t.m4 \
|
||||
$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
|
||||
$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mktime.m4 \
|
||||
$(top_srcdir)/gl/m4/mountlist.m4 \
|
||||
$(top_srcdir)/gl/m4/multiarch.m4 \
|
||||
$(top_srcdir)/gl/m4/netdb_h.m4 \
|
||||
$(top_srcdir)/gl/m4/netinet_in_h.m4 $(top_srcdir)/gl/m4/nls.m4 \
|
||||
$(top_srcdir)/gl/m4/onceonly_2_57.m4 $(top_srcdir)/gl/m4/po.m4 \
|
||||
$(top_srcdir)/gl/m4/onceonly.m4 $(top_srcdir)/gl/m4/open.m4 \
|
||||
$(top_srcdir)/gl/m4/po.m4 $(top_srcdir)/gl/m4/printf.m4 \
|
||||
$(top_srcdir)/gl/m4/progtest.m4 $(top_srcdir)/gl/m4/regex.m4 \
|
||||
$(top_srcdir)/gl/m4/safe-read.m4 \
|
||||
$(top_srcdir)/gl/m4/safe-write.m4 \
|
||||
$(top_srcdir)/gl/m4/size_max.m4 \
|
||||
$(top_srcdir)/gl/m4/servent.m4 $(top_srcdir)/gl/m4/size_max.m4 \
|
||||
$(top_srcdir)/gl/m4/snprintf.m4 $(top_srcdir)/gl/m4/socklen.m4 \
|
||||
$(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
|
||||
$(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stdint.m4 \
|
||||
|
|
@ -93,13 +103,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
|
|||
$(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \
|
||||
$(top_srcdir)/gl/m4/strnlen.m4 \
|
||||
$(top_srcdir)/gl/m4/sys_socket_h.m4 \
|
||||
$(top_srcdir)/gl/m4/time_h.m4 $(top_srcdir)/gl/m4/time_r.m4 \
|
||||
$(top_srcdir)/gl/m4/timegm.m4 \
|
||||
$(top_srcdir)/gl/m4/unistd-safer.m4 \
|
||||
$(top_srcdir)/gl/m4/unistd_h.m4 \
|
||||
$(top_srcdir)/gl/m4/vasnprintf.m4 \
|
||||
$(top_srcdir)/gl/m4/vasprintf.m4 \
|
||||
$(top_srcdir)/gl/m4/vsnprintf.m4 $(top_srcdir)/gl/m4/wchar.m4 \
|
||||
$(top_srcdir)/gl/m4/wchar_t.m4 $(top_srcdir)/gl/m4/wctype.m4 \
|
||||
$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \
|
||||
$(top_srcdir)/gl/m4/wchar_t.m4 $(top_srcdir)/gl/m4/wcrtomb.m4 \
|
||||
$(top_srcdir)/gl/m4/wctype.m4 $(top_srcdir)/gl/m4/wint_t.m4 \
|
||||
$(top_srcdir)/gl/m4/write.m4 $(top_srcdir)/gl/m4/xalloc.m4 \
|
||||
$(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
|
|
@ -108,28 +121,56 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
|
|||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
PROGRAMS = $(noinst_PROGRAMS)
|
||||
am_test_base64_OBJECTS = test_base64-test_base64.$(OBJEXT)
|
||||
test_base64_OBJECTS = $(am_test_base64_OBJECTS)
|
||||
test_base64_DEPENDENCIES = $(top_srcdir)/gl/base64.o
|
||||
am_test_cmd_OBJECTS = test_cmd-test_cmd.$(OBJEXT)
|
||||
test_cmd_OBJECTS = $(am_test_cmd_OBJECTS)
|
||||
test_cmd_DEPENDENCIES = ../utils_cmd.o ../utils_base.o
|
||||
am_test_disk_OBJECTS = test_disk-test_disk.$(OBJEXT)
|
||||
test_disk_OBJECTS = $(am_test_disk_OBJECTS)
|
||||
test_disk_DEPENDENCIES = ../utils_disk.o $(top_srcdir)/gl/libgnu.a
|
||||
am_test_ini_OBJECTS = test_ini-test_ini.$(OBJEXT)
|
||||
test_ini_OBJECTS = $(am_test_ini_OBJECTS)
|
||||
test_ini_DEPENDENCIES = ../utils_base.o ../parse_ini.o
|
||||
am_test_opts_OBJECTS = test_opts-test_opts.$(OBJEXT)
|
||||
test_opts_OBJECTS = $(am_test_opts_OBJECTS)
|
||||
test_opts_DEPENDENCIES = ../utils_base.o ../parse_ini.o \
|
||||
../extra_opts.o
|
||||
am_test_tcp_OBJECTS = test_tcp-test_tcp.$(OBJEXT)
|
||||
test_tcp_OBJECTS = $(am_test_tcp_OBJECTS)
|
||||
test_tcp_DEPENDENCIES = ../utils_tcp.o
|
||||
am_test_utils_OBJECTS = test_utils-test_utils.$(OBJEXT)
|
||||
test_utils_OBJECTS = $(am_test_utils_OBJECTS)
|
||||
test_utils_DEPENDENCIES = ../utils_base.o
|
||||
test_base64_SOURCES = test_base64.c
|
||||
test_base64_OBJECTS = test_base64.$(OBJEXT)
|
||||
test_base64_LDADD = $(LDADD)
|
||||
test_base64_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_cmd_SOURCES = test_cmd.c
|
||||
test_cmd_OBJECTS = test_cmd.$(OBJEXT)
|
||||
test_cmd_LDADD = $(LDADD)
|
||||
test_cmd_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_disk_SOURCES = test_disk.c
|
||||
test_disk_OBJECTS = test_disk.$(OBJEXT)
|
||||
test_disk_LDADD = $(LDADD)
|
||||
test_disk_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_ini1_SOURCES = test_ini1.c
|
||||
test_ini1_OBJECTS = test_ini1.$(OBJEXT)
|
||||
test_ini1_LDADD = $(LDADD)
|
||||
test_ini1_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_ini3_SOURCES = test_ini3.c
|
||||
test_ini3_OBJECTS = test_ini3.$(OBJEXT)
|
||||
test_ini3_LDADD = $(LDADD)
|
||||
test_ini3_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_opts1_SOURCES = test_opts1.c
|
||||
test_opts1_OBJECTS = test_opts1.$(OBJEXT)
|
||||
test_opts1_LDADD = $(LDADD)
|
||||
test_opts1_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_opts2_SOURCES = test_opts2.c
|
||||
test_opts2_OBJECTS = test_opts2.$(OBJEXT)
|
||||
test_opts2_LDADD = $(LDADD)
|
||||
test_opts2_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_opts3_SOURCES = test_opts3.c
|
||||
test_opts3_OBJECTS = test_opts3.$(OBJEXT)
|
||||
test_opts3_LDADD = $(LDADD)
|
||||
test_opts3_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_tcp_SOURCES = test_tcp.c
|
||||
test_tcp_OBJECTS = test_tcp.$(OBJEXT)
|
||||
test_tcp_LDADD = $(LDADD)
|
||||
test_tcp_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
test_utils_SOURCES = test_utils.c
|
||||
test_utils_OBJECTS = test_utils.$(OBJEXT)
|
||||
test_utils_LDADD = $(LDADD)
|
||||
test_utils_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
|
||||
$(top_srcdir)/gl/libgnu.a
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
|
|
@ -141,12 +182,9 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
|
|||
CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(test_base64_SOURCES) $(test_cmd_SOURCES) \
|
||||
$(test_disk_SOURCES) $(test_ini_SOURCES) $(test_opts_SOURCES) \
|
||||
$(test_tcp_SOURCES) $(test_utils_SOURCES)
|
||||
DIST_SOURCES = $(test_base64_SOURCES) $(test_cmd_SOURCES) \
|
||||
$(test_disk_SOURCES) $(test_ini_SOURCES) $(test_opts_SOURCES) \
|
||||
$(test_tcp_SOURCES) $(test_utils_SOURCES)
|
||||
DIST_SOURCES = test_base64.c test_cmd.c test_disk.c test_ini1.c \
|
||||
test_ini3.c test_opts1.c test_opts2.c test_opts3.c test_tcp.c \
|
||||
test_utils.c
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
|
@ -157,6 +195,7 @@ ALLOCA_H = @ALLOCA_H@
|
|||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
|
||||
AR = @AR@
|
||||
ARPA_INET_H = @ARPA_INET_H@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
|
@ -187,16 +226,24 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EOVERFLOW = @EOVERFLOW@
|
||||
EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@
|
||||
EMULTIHOP_VALUE = @EMULTIHOP_VALUE@
|
||||
ENOLINK_HIDDEN = @ENOLINK_HIDDEN@
|
||||
ENOLINK_VALUE = @ENOLINK_VALUE@
|
||||
EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
|
||||
EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
|
||||
ERRNO_H = @ERRNO_H@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXTRAS = @EXTRAS@
|
||||
EXTRAS_ROOT = @EXTRAS_ROOT@
|
||||
EXTRA_NETOBJS = @EXTRA_NETOBJS@
|
||||
EXTRA_TEST = @EXTRA_TEST@
|
||||
F77 = @F77@
|
||||
FCNTL_H = @FCNTL_H@
|
||||
FFLAGS = @FFLAGS@
|
||||
FLOAT_H = @FLOAT_H@
|
||||
FLOORF_LIBM = @FLOORF_LIBM@
|
||||
GETADDRINFO_LIB = @GETADDRINFO_LIB@
|
||||
GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
|
||||
GETOPT_H = @GETOPT_H@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
|
|
@ -205,47 +252,85 @@ GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
|
|||
GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GNULIB_ACCEPT = @GNULIB_ACCEPT@
|
||||
GNULIB_ATOLL = @GNULIB_ATOLL@
|
||||
GNULIB_BIND = @GNULIB_BIND@
|
||||
GNULIB_BTOWC = @GNULIB_BTOWC@
|
||||
GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
|
||||
GNULIB_CEILF = @GNULIB_CEILF@
|
||||
GNULIB_CEILL = @GNULIB_CEILL@
|
||||
GNULIB_CHOWN = @GNULIB_CHOWN@
|
||||
GNULIB_CLOSE = @GNULIB_CLOSE@
|
||||
GNULIB_CONNECT = @GNULIB_CONNECT@
|
||||
GNULIB_DPRINTF = @GNULIB_DPRINTF@
|
||||
GNULIB_DUP2 = @GNULIB_DUP2@
|
||||
GNULIB_ENVIRON = @GNULIB_ENVIRON@
|
||||
GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
|
||||
GNULIB_FCHDIR = @GNULIB_FCHDIR@
|
||||
GNULIB_FCLOSE = @GNULIB_FCLOSE@
|
||||
GNULIB_FFLUSH = @GNULIB_FFLUSH@
|
||||
GNULIB_FLOORF = @GNULIB_FLOORF@
|
||||
GNULIB_FLOORL = @GNULIB_FLOORL@
|
||||
GNULIB_FOPEN = @GNULIB_FOPEN@
|
||||
GNULIB_FPRINTF = @GNULIB_FPRINTF@
|
||||
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
|
||||
GNULIB_FPUTC = @GNULIB_FPUTC@
|
||||
GNULIB_FPUTS = @GNULIB_FPUTS@
|
||||
GNULIB_FREOPEN = @GNULIB_FREOPEN@
|
||||
GNULIB_FREXP = @GNULIB_FREXP@
|
||||
GNULIB_FREXPL = @GNULIB_FREXPL@
|
||||
GNULIB_FSEEK = @GNULIB_FSEEK@
|
||||
GNULIB_FSEEKO = @GNULIB_FSEEKO@
|
||||
GNULIB_FSYNC = @GNULIB_FSYNC@
|
||||
GNULIB_FTELL = @GNULIB_FTELL@
|
||||
GNULIB_FTELLO = @GNULIB_FTELLO@
|
||||
GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
|
||||
GNULIB_FWRITE = @GNULIB_FWRITE@
|
||||
GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@
|
||||
GNULIB_GETCWD = @GNULIB_GETCWD@
|
||||
GNULIB_GETDELIM = @GNULIB_GETDELIM@
|
||||
GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
|
||||
GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
|
||||
GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
|
||||
GNULIB_GETLINE = @GNULIB_GETLINE@
|
||||
GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
|
||||
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
|
||||
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
|
||||
GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
|
||||
GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
|
||||
GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
|
||||
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
|
||||
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
|
||||
GNULIB_INET_NTOP = @GNULIB_INET_NTOP@
|
||||
GNULIB_INET_PTON = @GNULIB_INET_PTON@
|
||||
GNULIB_ISFINITE = @GNULIB_ISFINITE@
|
||||
GNULIB_ISINF = @GNULIB_ISINF@
|
||||
GNULIB_ISNAN = @GNULIB_ISNAN@
|
||||
GNULIB_ISNAND = @GNULIB_ISNAND@
|
||||
GNULIB_ISNANF = @GNULIB_ISNANF@
|
||||
GNULIB_ISNANL = @GNULIB_ISNANL@
|
||||
GNULIB_LCHOWN = @GNULIB_LCHOWN@
|
||||
GNULIB_LDEXPL = @GNULIB_LDEXPL@
|
||||
GNULIB_LINK = @GNULIB_LINK@
|
||||
GNULIB_LISTEN = @GNULIB_LISTEN@
|
||||
GNULIB_LSEEK = @GNULIB_LSEEK@
|
||||
GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
|
||||
GNULIB_MATHL = @GNULIB_MATHL@
|
||||
GNULIB_MBRLEN = @GNULIB_MBRLEN@
|
||||
GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
|
||||
GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
|
||||
GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
|
||||
GNULIB_MBSCHR = @GNULIB_MBSCHR@
|
||||
GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
|
||||
GNULIB_MBSINIT = @GNULIB_MBSINIT@
|
||||
GNULIB_MBSLEN = @GNULIB_MBSLEN@
|
||||
GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
|
||||
GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
|
||||
GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
|
||||
GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
|
||||
GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
|
||||
GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
|
||||
GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
|
||||
GNULIB_MBSSEP = @GNULIB_MBSSEP@
|
||||
GNULIB_MBSSPN = @GNULIB_MBSSPN@
|
||||
GNULIB_MBSSTR = @GNULIB_MBSSTR@
|
||||
|
|
@ -255,18 +340,37 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
|
|||
GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
|
||||
GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
|
||||
GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
|
||||
GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
|
||||
GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
|
||||
GNULIB_OPEN = @GNULIB_OPEN@
|
||||
GNULIB_PERROR = @GNULIB_PERROR@
|
||||
GNULIB_PRINTF = @GNULIB_PRINTF@
|
||||
GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
|
||||
GNULIB_PUTC = @GNULIB_PUTC@
|
||||
GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
|
||||
GNULIB_PUTENV = @GNULIB_PUTENV@
|
||||
GNULIB_PUTS = @GNULIB_PUTS@
|
||||
GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
|
||||
GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
|
||||
GNULIB_READLINK = @GNULIB_READLINK@
|
||||
GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
|
||||
GNULIB_RECV = @GNULIB_RECV@
|
||||
GNULIB_RECVFROM = @GNULIB_RECVFROM@
|
||||
GNULIB_ROUND = @GNULIB_ROUND@
|
||||
GNULIB_ROUNDF = @GNULIB_ROUNDF@
|
||||
GNULIB_ROUNDL = @GNULIB_ROUNDL@
|
||||
GNULIB_RPMATCH = @GNULIB_RPMATCH@
|
||||
GNULIB_SEND = @GNULIB_SEND@
|
||||
GNULIB_SENDTO = @GNULIB_SENDTO@
|
||||
GNULIB_SETENV = @GNULIB_SETENV@
|
||||
GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
|
||||
GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
|
||||
GNULIB_SIGNBIT = @GNULIB_SIGNBIT@
|
||||
GNULIB_SLEEP = @GNULIB_SLEEP@
|
||||
GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
|
||||
GNULIB_SOCKET = @GNULIB_SOCKET@
|
||||
GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
|
||||
GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
|
||||
GNULIB_STPCPY = @GNULIB_STPCPY@
|
||||
GNULIB_STPNCPY = @GNULIB_STPNCPY@
|
||||
GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
|
||||
|
|
@ -279,32 +383,57 @@ GNULIB_STRPBRK = @GNULIB_STRPBRK@
|
|||
GNULIB_STRSEP = @GNULIB_STRSEP@
|
||||
GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
|
||||
GNULIB_STRSTR = @GNULIB_STRSTR@
|
||||
GNULIB_STRTOD = @GNULIB_STRTOD@
|
||||
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
|
||||
GNULIB_STRTOLL = @GNULIB_STRTOLL@
|
||||
GNULIB_STRTOULL = @GNULIB_STRTOULL@
|
||||
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
|
||||
GNULIB_TRUNC = @GNULIB_TRUNC@
|
||||
GNULIB_TRUNCF = @GNULIB_TRUNCF@
|
||||
GNULIB_TRUNCL = @GNULIB_TRUNCL@
|
||||
GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
|
||||
GNULIB_UNSETENV = @GNULIB_UNSETENV@
|
||||
GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
|
||||
GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
|
||||
GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
|
||||
GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
|
||||
GNULIB_VPRINTF = @GNULIB_VPRINTF@
|
||||
GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
|
||||
GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
|
||||
GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
|
||||
GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
|
||||
GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
|
||||
GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
|
||||
GNULIB_WCTOB = @GNULIB_WCTOB@
|
||||
GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
|
||||
GNULIB_WRITE = @GNULIB_WRITE@
|
||||
GREP = @GREP@
|
||||
HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@
|
||||
HAVE_ATOLL = @HAVE_ATOLL@
|
||||
HAVE_BTOWC = @HAVE_BTOWC@
|
||||
HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
|
||||
HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@
|
||||
HAVE_DECL_ASINL = @HAVE_DECL_ASINL@
|
||||
HAVE_DECL_ATANL = @HAVE_DECL_ATANL@
|
||||
HAVE_DECL_COSL = @HAVE_DECL_COSL@
|
||||
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
|
||||
HAVE_DECL_EXPL = @HAVE_DECL_EXPL@
|
||||
HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@
|
||||
HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@
|
||||
HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@
|
||||
HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@
|
||||
HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
|
||||
HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
|
||||
HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
|
||||
HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
|
||||
HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@
|
||||
HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@
|
||||
HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@
|
||||
HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@
|
||||
HAVE_DECL_LOGL = @HAVE_DECL_LOGL@
|
||||
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
|
||||
HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
|
||||
HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
|
||||
HAVE_DECL_SINL = @HAVE_DECL_SINL@
|
||||
HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
|
||||
HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@
|
||||
|
|
@ -317,25 +446,46 @@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
|
|||
HAVE_DECL_TANL = @HAVE_DECL_TANL@
|
||||
HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@
|
||||
HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@
|
||||
HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@
|
||||
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
|
||||
HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
|
||||
HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
|
||||
HAVE_DPRINTF = @HAVE_DPRINTF@
|
||||
HAVE_DUP2 = @HAVE_DUP2@
|
||||
HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
|
||||
HAVE_FSEEKO = @HAVE_FSEEKO@
|
||||
HAVE_FSYNC = @HAVE_FSYNC@
|
||||
HAVE_FTELLO = @HAVE_FTELLO@
|
||||
HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
|
||||
HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
|
||||
HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
|
||||
HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
|
||||
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
|
||||
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
|
||||
HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@
|
||||
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
|
||||
HAVE_ISNAND = @HAVE_ISNAND@
|
||||
HAVE_ISNANF = @HAVE_ISNANF@
|
||||
HAVE_ISNANL = @HAVE_ISNANL@
|
||||
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
|
||||
HAVE_LINK = @HAVE_LINK@
|
||||
HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
|
||||
HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
|
||||
HAVE_MBRLEN = @HAVE_MBRLEN@
|
||||
HAVE_MBRTOWC = @HAVE_MBRTOWC@
|
||||
HAVE_MBSINIT = @HAVE_MBSINIT@
|
||||
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
|
||||
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
|
||||
HAVE_MEMPCPY = @HAVE_MEMPCPY@
|
||||
HAVE_MKDTEMP = @HAVE_MKDTEMP@
|
||||
HAVE_NETDB_H = @HAVE_NETDB_H@
|
||||
HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@
|
||||
HAVE_OS_H = @HAVE_OS_H@
|
||||
HAVE_RANDOM_H = @HAVE_RANDOM_H@
|
||||
HAVE_RANDOM_R = @HAVE_RANDOM_R@
|
||||
HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
|
||||
HAVE_READLINK = @HAVE_READLINK@
|
||||
HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
|
||||
HAVE_RPMATCH = @HAVE_RPMATCH@
|
||||
HAVE_SETENV = @HAVE_SETENV@
|
||||
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
|
||||
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
|
||||
|
|
@ -349,8 +499,16 @@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
|
|||
HAVE_STRNDUP = @HAVE_STRNDUP@
|
||||
HAVE_STRPBRK = @HAVE_STRPBRK@
|
||||
HAVE_STRSEP = @HAVE_STRSEP@
|
||||
HAVE_STRTOD = @HAVE_STRTOD@
|
||||
HAVE_STRTOLL = @HAVE_STRTOLL@
|
||||
HAVE_STRTOULL = @HAVE_STRTOULL@
|
||||
HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@
|
||||
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
|
||||
HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
|
||||
HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
|
||||
HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
|
||||
HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
|
||||
HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
|
||||
HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
|
||||
HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
|
||||
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
|
||||
|
|
@ -358,14 +516,20 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@
|
|||
HAVE_UNSETENV = @HAVE_UNSETENV@
|
||||
HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
|
||||
HAVE_VASPRINTF = @HAVE_VASPRINTF@
|
||||
HAVE_VDPRINTF = @HAVE_VDPRINTF@
|
||||
HAVE_WCHAR_H = @HAVE_WCHAR_H@
|
||||
HAVE_WCRTOMB = @HAVE_WCRTOMB@
|
||||
HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
|
||||
HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
|
||||
HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
|
||||
HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
|
||||
HAVE_WINT_T = @HAVE_WINT_T@
|
||||
HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
|
||||
HAVE__BOOL = @HAVE__BOOL@
|
||||
HOSTENT_LIB = @HOSTENT_LIB@
|
||||
HOSTNAME = @HOSTNAME@
|
||||
INCLUDE_NEXT = @INCLUDE_NEXT@
|
||||
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
|
|
@ -383,10 +547,14 @@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
|
|||
LIBICONV = @LIBICONV@
|
||||
LIBINTL = @LIBINTL@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBINTL@
|
||||
LIBS = @LTLIBINTL@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LN_S = @LN_S@
|
||||
LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
|
||||
LOCALE_FR = @LOCALE_FR@
|
||||
LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
|
||||
LOCALE_JA = @LOCALE_JA@
|
||||
LOCALE_ZH_CN = @LOCALE_ZH_CN@
|
||||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBINTL = @LTLIBINTL@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
|
|
@ -399,15 +567,21 @@ MYSQLCFLAGS = @MYSQLCFLAGS@
|
|||
MYSQLINCLUDE = @MYSQLINCLUDE@
|
||||
MYSQLLIBS = @MYSQLLIBS@
|
||||
NEED_SETGID = @NEED_SETGID@
|
||||
NETDB_H = @NETDB_H@
|
||||
NETINET_IN_H = @NETINET_IN_H@
|
||||
NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@
|
||||
NEXT_ERRNO_H = @NEXT_ERRNO_H@
|
||||
NEXT_FCNTL_H = @NEXT_FCNTL_H@
|
||||
NEXT_FLOAT_H = @NEXT_FLOAT_H@
|
||||
NEXT_MATH_H = @NEXT_MATH_H@
|
||||
NEXT_NETDB_H = @NEXT_NETDB_H@
|
||||
NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@
|
||||
NEXT_STDINT_H = @NEXT_STDINT_H@
|
||||
NEXT_STDIO_H = @NEXT_STDIO_H@
|
||||
NEXT_STDLIB_H = @NEXT_STDLIB_H@
|
||||
NEXT_STRING_H = @NEXT_STRING_H@
|
||||
NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
|
||||
NEXT_TIME_H = @NEXT_TIME_H@
|
||||
NEXT_UNISTD_H = @NEXT_UNISTD_H@
|
||||
NEXT_WCHAR_H = @NEXT_WCHAR_H@
|
||||
NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
|
||||
|
|
@ -449,16 +623,23 @@ PKG_ARCH = @PKG_ARCH@
|
|||
PLUGIN_TEST = @PLUGIN_TEST@
|
||||
POSUB = @POSUB@
|
||||
POW_LIB = @POW_LIB@
|
||||
PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
|
||||
PST3CFLAGS = @PST3CFLAGS@
|
||||
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
|
||||
PYTHON = @PYTHON@
|
||||
RADIUSLIBS = @RADIUSLIBS@
|
||||
RANLIB = @RANLIB@
|
||||
RELEASE = @RELEASE@
|
||||
RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
|
||||
RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
|
||||
REPLACE_BTOWC = @REPLACE_BTOWC@
|
||||
REPLACE_CEILF = @REPLACE_CEILF@
|
||||
REPLACE_CEILL = @REPLACE_CEILL@
|
||||
REPLACE_CHOWN = @REPLACE_CHOWN@
|
||||
REPLACE_CLOSE = @REPLACE_CLOSE@
|
||||
REPLACE_DPRINTF = @REPLACE_DPRINTF@
|
||||
REPLACE_FCHDIR = @REPLACE_FCHDIR@
|
||||
REPLACE_FCLOSE = @REPLACE_FCLOSE@
|
||||
REPLACE_FFLUSH = @REPLACE_FFLUSH@
|
||||
REPLACE_FLOORF = @REPLACE_FLOORF@
|
||||
REPLACE_FLOORL = @REPLACE_FLOORL@
|
||||
|
|
@ -474,12 +655,28 @@ REPLACE_FTELLO = @REPLACE_FTELLO@
|
|||
REPLACE_GETCWD = @REPLACE_GETCWD@
|
||||
REPLACE_GETLINE = @REPLACE_GETLINE@
|
||||
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
|
||||
REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
|
||||
REPLACE_ISFINITE = @REPLACE_ISFINITE@
|
||||
REPLACE_ISINF = @REPLACE_ISINF@
|
||||
REPLACE_ISNAN = @REPLACE_ISNAN@
|
||||
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
|
||||
REPLACE_LCHOWN = @REPLACE_LCHOWN@
|
||||
REPLACE_LDEXPL = @REPLACE_LDEXPL@
|
||||
REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
|
||||
REPLACE_LSEEK = @REPLACE_LSEEK@
|
||||
REPLACE_MBRLEN = @REPLACE_MBRLEN@
|
||||
REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
|
||||
REPLACE_MBSINIT = @REPLACE_MBSINIT@
|
||||
REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
|
||||
REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
|
||||
REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
|
||||
REPLACE_MEMMEM = @REPLACE_MEMMEM@
|
||||
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
|
||||
REPLACE_NAN = @REPLACE_NAN@
|
||||
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
|
||||
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
|
||||
REPLACE_OPEN = @REPLACE_OPEN@
|
||||
REPLACE_PERROR = @REPLACE_PERROR@
|
||||
REPLACE_PRINTF = @REPLACE_PRINTF@
|
||||
REPLACE_PUTENV = @REPLACE_PUTENV@
|
||||
REPLACE_ROUND = @REPLACE_ROUND@
|
||||
|
|
@ -489,19 +686,32 @@ REPLACE_SIGNBIT = @REPLACE_SIGNBIT@
|
|||
REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@
|
||||
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
|
||||
REPLACE_SPRINTF = @REPLACE_SPRINTF@
|
||||
REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
|
||||
REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
|
||||
REPLACE_STRDUP = @REPLACE_STRDUP@
|
||||
REPLACE_STRERROR = @REPLACE_STRERROR@
|
||||
REPLACE_STRPTIME = @REPLACE_STRPTIME@
|
||||
REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
|
||||
REPLACE_STRSTR = @REPLACE_STRSTR@
|
||||
REPLACE_STRTOD = @REPLACE_STRTOD@
|
||||
REPLACE_TIMEGM = @REPLACE_TIMEGM@
|
||||
REPLACE_TRUNCL = @REPLACE_TRUNCL@
|
||||
REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
|
||||
REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
|
||||
REPLACE_VFPRINTF = @REPLACE_VFPRINTF@
|
||||
REPLACE_VPRINTF = @REPLACE_VPRINTF@
|
||||
REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
|
||||
REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
|
||||
REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
|
||||
REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
|
||||
REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
|
||||
REPLACE_WCTOB = @REPLACE_WCTOB@
|
||||
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
|
||||
REPLACE_WRITE = @REPLACE_WRITE@
|
||||
REV_DATESTAMP = @REV_DATESTAMP@
|
||||
REV_TIMESTAMP = @REV_TIMESTAMP@
|
||||
SCRIPT_TEST = @SCRIPT_TEST@
|
||||
SERVENT_LIB = @SERVENT_LIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SH = @SH@
|
||||
SHELL = @SHELL@
|
||||
|
|
@ -515,6 +725,11 @@ STDINT_H = @STDINT_H@
|
|||
STRIP = @STRIP@
|
||||
SUPPORT = @SUPPORT@
|
||||
SYS_SOCKET_H = @SYS_SOCKET_H@
|
||||
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
|
||||
TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
|
||||
UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
|
||||
USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
|
||||
USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
|
||||
USE_NLS = @USE_NLS@
|
||||
USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
|
||||
USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
|
||||
|
|
@ -586,37 +801,17 @@ with_trusted_path = @with_trusted_path@
|
|||
# These two lines support "make check", but we use "make test"
|
||||
TESTS = @EXTRA_TEST@
|
||||
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
|
||||
np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini.t test_opts.t test_tcp.t test_utils.t
|
||||
np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t
|
||||
np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini
|
||||
EXTRA_DIST = $(np_test_scripts) $(np_test_files)
|
||||
test_utils_SOURCES = test_utils.c
|
||||
test_utils_CFLAGS = -g -I..
|
||||
test_utils_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_utils_LDADD = ../utils_base.o
|
||||
test_disk_SOURCES = test_disk.c
|
||||
test_disk_CFLAGS = -g -I..
|
||||
test_disk_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a
|
||||
test_tcp_SOURCES = test_tcp.c
|
||||
test_tcp_CFLAGS = -g -I..
|
||||
test_tcp_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_tcp_LDADD = ../utils_tcp.o
|
||||
test_cmd_SOURCES = test_cmd.c
|
||||
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_ini_SOURCES = test_ini.c
|
||||
test_ini_CFLAGS = -g -I..
|
||||
test_ini_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_ini_LDADD = ../utils_base.o ../parse_ini.o
|
||||
test_opts_SOURCES = test_opts.c
|
||||
test_opts_CFLAGS = -g -I..
|
||||
test_opts_LDFLAGS = -L/usr/local/lib -ltap
|
||||
test_opts_LDADD = ../utils_base.o ../parse_ini.o ../extra_opts.o
|
||||
@USE_LIBTAP_LOCAL_TRUE@tap_cflags = -I$(top_srcdir)/tap
|
||||
@USE_LIBTAP_LOCAL_FALSE@tap_ldflags = -L/usr/local/lib
|
||||
@USE_LIBTAP_LOCAL_TRUE@tap_ldflags = -L$(top_srcdir)/tap
|
||||
@USE_LIBTAP_LOCAL_TRUE@tap_ldadd = $(top_srcdir)/gl/libgnu.a
|
||||
AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
|
||||
AM_LDFLAGS = $(tap_ldflags) -ltap
|
||||
LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a
|
||||
SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
|
|
@ -673,12 +868,21 @@ test_cmd$(EXEEXT): $(test_cmd_OBJECTS) $(test_cmd_DEPENDENCIES)
|
|||
test_disk$(EXEEXT): $(test_disk_OBJECTS) $(test_disk_DEPENDENCIES)
|
||||
@rm -f test_disk$(EXEEXT)
|
||||
$(LINK) $(test_disk_LDFLAGS) $(test_disk_OBJECTS) $(test_disk_LDADD) $(LIBS)
|
||||
test_ini$(EXEEXT): $(test_ini_OBJECTS) $(test_ini_DEPENDENCIES)
|
||||
@rm -f test_ini$(EXEEXT)
|
||||
$(LINK) $(test_ini_LDFLAGS) $(test_ini_OBJECTS) $(test_ini_LDADD) $(LIBS)
|
||||
test_opts$(EXEEXT): $(test_opts_OBJECTS) $(test_opts_DEPENDENCIES)
|
||||
@rm -f test_opts$(EXEEXT)
|
||||
$(LINK) $(test_opts_LDFLAGS) $(test_opts_OBJECTS) $(test_opts_LDADD) $(LIBS)
|
||||
test_ini1$(EXEEXT): $(test_ini1_OBJECTS) $(test_ini1_DEPENDENCIES)
|
||||
@rm -f test_ini1$(EXEEXT)
|
||||
$(LINK) $(test_ini1_LDFLAGS) $(test_ini1_OBJECTS) $(test_ini1_LDADD) $(LIBS)
|
||||
test_ini3$(EXEEXT): $(test_ini3_OBJECTS) $(test_ini3_DEPENDENCIES)
|
||||
@rm -f test_ini3$(EXEEXT)
|
||||
$(LINK) $(test_ini3_LDFLAGS) $(test_ini3_OBJECTS) $(test_ini3_LDADD) $(LIBS)
|
||||
test_opts1$(EXEEXT): $(test_opts1_OBJECTS) $(test_opts1_DEPENDENCIES)
|
||||
@rm -f test_opts1$(EXEEXT)
|
||||
$(LINK) $(test_opts1_LDFLAGS) $(test_opts1_OBJECTS) $(test_opts1_LDADD) $(LIBS)
|
||||
test_opts2$(EXEEXT): $(test_opts2_OBJECTS) $(test_opts2_DEPENDENCIES)
|
||||
@rm -f test_opts2$(EXEEXT)
|
||||
$(LINK) $(test_opts2_LDFLAGS) $(test_opts2_OBJECTS) $(test_opts2_LDADD) $(LIBS)
|
||||
test_opts3$(EXEEXT): $(test_opts3_OBJECTS) $(test_opts3_DEPENDENCIES)
|
||||
@rm -f test_opts3$(EXEEXT)
|
||||
$(LINK) $(test_opts3_LDFLAGS) $(test_opts3_OBJECTS) $(test_opts3_LDADD) $(LIBS)
|
||||
test_tcp$(EXEEXT): $(test_tcp_OBJECTS) $(test_tcp_DEPENDENCIES)
|
||||
@rm -f test_tcp$(EXEEXT)
|
||||
$(LINK) $(test_tcp_LDFLAGS) $(test_tcp_OBJECTS) $(test_tcp_LDADD) $(LIBS)
|
||||
|
|
@ -692,13 +896,16 @@ mostlyclean-compile:
|
|||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_base64-test_base64.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmd-test_cmd.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_disk-test_disk.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ini-test_ini.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts-test_opts.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tcp-test_tcp.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utils-test_utils.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_base64.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmd.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_disk.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ini1.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ini3.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts1.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts2.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts3.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tcp.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utils.Po@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
|
|
@ -721,104 +928,6 @@ distclean-compile:
|
|||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
||||
|
||||
test_base64-test_base64.o: test_base64.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_base64_CFLAGS) $(CFLAGS) -MT test_base64-test_base64.o -MD -MP -MF "$(DEPDIR)/test_base64-test_base64.Tpo" -c -o test_base64-test_base64.o `test -f 'test_base64.c' || echo '$(srcdir)/'`test_base64.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_base64-test_base64.Tpo" "$(DEPDIR)/test_base64-test_base64.Po"; else rm -f "$(DEPDIR)/test_base64-test_base64.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_base64.c' object='test_base64-test_base64.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_base64_CFLAGS) $(CFLAGS) -c -o test_base64-test_base64.o `test -f 'test_base64.c' || echo '$(srcdir)/'`test_base64.c
|
||||
|
||||
test_base64-test_base64.obj: test_base64.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_base64_CFLAGS) $(CFLAGS) -MT test_base64-test_base64.obj -MD -MP -MF "$(DEPDIR)/test_base64-test_base64.Tpo" -c -o test_base64-test_base64.obj `if test -f 'test_base64.c'; then $(CYGPATH_W) 'test_base64.c'; else $(CYGPATH_W) '$(srcdir)/test_base64.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_base64-test_base64.Tpo" "$(DEPDIR)/test_base64-test_base64.Po"; else rm -f "$(DEPDIR)/test_base64-test_base64.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_base64.c' object='test_base64-test_base64.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_base64_CFLAGS) $(CFLAGS) -c -o test_base64-test_base64.obj `if test -f 'test_base64.c'; then $(CYGPATH_W) 'test_base64.c'; else $(CYGPATH_W) '$(srcdir)/test_base64.c'; fi`
|
||||
|
||||
test_cmd-test_cmd.o: test_cmd.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmd_CFLAGS) $(CFLAGS) -MT test_cmd-test_cmd.o -MD -MP -MF "$(DEPDIR)/test_cmd-test_cmd.Tpo" -c -o test_cmd-test_cmd.o `test -f 'test_cmd.c' || echo '$(srcdir)/'`test_cmd.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_cmd-test_cmd.Tpo" "$(DEPDIR)/test_cmd-test_cmd.Po"; else rm -f "$(DEPDIR)/test_cmd-test_cmd.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_cmd.c' object='test_cmd-test_cmd.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmd_CFLAGS) $(CFLAGS) -c -o test_cmd-test_cmd.o `test -f 'test_cmd.c' || echo '$(srcdir)/'`test_cmd.c
|
||||
|
||||
test_cmd-test_cmd.obj: test_cmd.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmd_CFLAGS) $(CFLAGS) -MT test_cmd-test_cmd.obj -MD -MP -MF "$(DEPDIR)/test_cmd-test_cmd.Tpo" -c -o test_cmd-test_cmd.obj `if test -f 'test_cmd.c'; then $(CYGPATH_W) 'test_cmd.c'; else $(CYGPATH_W) '$(srcdir)/test_cmd.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_cmd-test_cmd.Tpo" "$(DEPDIR)/test_cmd-test_cmd.Po"; else rm -f "$(DEPDIR)/test_cmd-test_cmd.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_cmd.c' object='test_cmd-test_cmd.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmd_CFLAGS) $(CFLAGS) -c -o test_cmd-test_cmd.obj `if test -f 'test_cmd.c'; then $(CYGPATH_W) 'test_cmd.c'; else $(CYGPATH_W) '$(srcdir)/test_cmd.c'; fi`
|
||||
|
||||
test_disk-test_disk.o: test_disk.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_disk_CFLAGS) $(CFLAGS) -MT test_disk-test_disk.o -MD -MP -MF "$(DEPDIR)/test_disk-test_disk.Tpo" -c -o test_disk-test_disk.o `test -f 'test_disk.c' || echo '$(srcdir)/'`test_disk.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_disk-test_disk.Tpo" "$(DEPDIR)/test_disk-test_disk.Po"; else rm -f "$(DEPDIR)/test_disk-test_disk.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_disk.c' object='test_disk-test_disk.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_disk_CFLAGS) $(CFLAGS) -c -o test_disk-test_disk.o `test -f 'test_disk.c' || echo '$(srcdir)/'`test_disk.c
|
||||
|
||||
test_disk-test_disk.obj: test_disk.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_disk_CFLAGS) $(CFLAGS) -MT test_disk-test_disk.obj -MD -MP -MF "$(DEPDIR)/test_disk-test_disk.Tpo" -c -o test_disk-test_disk.obj `if test -f 'test_disk.c'; then $(CYGPATH_W) 'test_disk.c'; else $(CYGPATH_W) '$(srcdir)/test_disk.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_disk-test_disk.Tpo" "$(DEPDIR)/test_disk-test_disk.Po"; else rm -f "$(DEPDIR)/test_disk-test_disk.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_disk.c' object='test_disk-test_disk.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_disk_CFLAGS) $(CFLAGS) -c -o test_disk-test_disk.obj `if test -f 'test_disk.c'; then $(CYGPATH_W) 'test_disk.c'; else $(CYGPATH_W) '$(srcdir)/test_disk.c'; fi`
|
||||
|
||||
test_ini-test_ini.o: test_ini.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ini_CFLAGS) $(CFLAGS) -MT test_ini-test_ini.o -MD -MP -MF "$(DEPDIR)/test_ini-test_ini.Tpo" -c -o test_ini-test_ini.o `test -f 'test_ini.c' || echo '$(srcdir)/'`test_ini.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_ini-test_ini.Tpo" "$(DEPDIR)/test_ini-test_ini.Po"; else rm -f "$(DEPDIR)/test_ini-test_ini.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_ini.c' object='test_ini-test_ini.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ini_CFLAGS) $(CFLAGS) -c -o test_ini-test_ini.o `test -f 'test_ini.c' || echo '$(srcdir)/'`test_ini.c
|
||||
|
||||
test_ini-test_ini.obj: test_ini.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ini_CFLAGS) $(CFLAGS) -MT test_ini-test_ini.obj -MD -MP -MF "$(DEPDIR)/test_ini-test_ini.Tpo" -c -o test_ini-test_ini.obj `if test -f 'test_ini.c'; then $(CYGPATH_W) 'test_ini.c'; else $(CYGPATH_W) '$(srcdir)/test_ini.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_ini-test_ini.Tpo" "$(DEPDIR)/test_ini-test_ini.Po"; else rm -f "$(DEPDIR)/test_ini-test_ini.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_ini.c' object='test_ini-test_ini.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ini_CFLAGS) $(CFLAGS) -c -o test_ini-test_ini.obj `if test -f 'test_ini.c'; then $(CYGPATH_W) 'test_ini.c'; else $(CYGPATH_W) '$(srcdir)/test_ini.c'; fi`
|
||||
|
||||
test_opts-test_opts.o: test_opts.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_opts_CFLAGS) $(CFLAGS) -MT test_opts-test_opts.o -MD -MP -MF "$(DEPDIR)/test_opts-test_opts.Tpo" -c -o test_opts-test_opts.o `test -f 'test_opts.c' || echo '$(srcdir)/'`test_opts.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_opts-test_opts.Tpo" "$(DEPDIR)/test_opts-test_opts.Po"; else rm -f "$(DEPDIR)/test_opts-test_opts.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_opts.c' object='test_opts-test_opts.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_opts_CFLAGS) $(CFLAGS) -c -o test_opts-test_opts.o `test -f 'test_opts.c' || echo '$(srcdir)/'`test_opts.c
|
||||
|
||||
test_opts-test_opts.obj: test_opts.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_opts_CFLAGS) $(CFLAGS) -MT test_opts-test_opts.obj -MD -MP -MF "$(DEPDIR)/test_opts-test_opts.Tpo" -c -o test_opts-test_opts.obj `if test -f 'test_opts.c'; then $(CYGPATH_W) 'test_opts.c'; else $(CYGPATH_W) '$(srcdir)/test_opts.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_opts-test_opts.Tpo" "$(DEPDIR)/test_opts-test_opts.Po"; else rm -f "$(DEPDIR)/test_opts-test_opts.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_opts.c' object='test_opts-test_opts.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_opts_CFLAGS) $(CFLAGS) -c -o test_opts-test_opts.obj `if test -f 'test_opts.c'; then $(CYGPATH_W) 'test_opts.c'; else $(CYGPATH_W) '$(srcdir)/test_opts.c'; fi`
|
||||
|
||||
test_tcp-test_tcp.o: test_tcp.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tcp_CFLAGS) $(CFLAGS) -MT test_tcp-test_tcp.o -MD -MP -MF "$(DEPDIR)/test_tcp-test_tcp.Tpo" -c -o test_tcp-test_tcp.o `test -f 'test_tcp.c' || echo '$(srcdir)/'`test_tcp.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_tcp-test_tcp.Tpo" "$(DEPDIR)/test_tcp-test_tcp.Po"; else rm -f "$(DEPDIR)/test_tcp-test_tcp.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_tcp.c' object='test_tcp-test_tcp.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tcp_CFLAGS) $(CFLAGS) -c -o test_tcp-test_tcp.o `test -f 'test_tcp.c' || echo '$(srcdir)/'`test_tcp.c
|
||||
|
||||
test_tcp-test_tcp.obj: test_tcp.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tcp_CFLAGS) $(CFLAGS) -MT test_tcp-test_tcp.obj -MD -MP -MF "$(DEPDIR)/test_tcp-test_tcp.Tpo" -c -o test_tcp-test_tcp.obj `if test -f 'test_tcp.c'; then $(CYGPATH_W) 'test_tcp.c'; else $(CYGPATH_W) '$(srcdir)/test_tcp.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_tcp-test_tcp.Tpo" "$(DEPDIR)/test_tcp-test_tcp.Po"; else rm -f "$(DEPDIR)/test_tcp-test_tcp.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_tcp.c' object='test_tcp-test_tcp.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tcp_CFLAGS) $(CFLAGS) -c -o test_tcp-test_tcp.obj `if test -f 'test_tcp.c'; then $(CYGPATH_W) 'test_tcp.c'; else $(CYGPATH_W) '$(srcdir)/test_tcp.c'; fi`
|
||||
|
||||
test_utils-test_utils.o: test_utils.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utils_CFLAGS) $(CFLAGS) -MT test_utils-test_utils.o -MD -MP -MF "$(DEPDIR)/test_utils-test_utils.Tpo" -c -o test_utils-test_utils.o `test -f 'test_utils.c' || echo '$(srcdir)/'`test_utils.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_utils-test_utils.Tpo" "$(DEPDIR)/test_utils-test_utils.Po"; else rm -f "$(DEPDIR)/test_utils-test_utils.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_utils.c' object='test_utils-test_utils.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utils_CFLAGS) $(CFLAGS) -c -o test_utils-test_utils.o `test -f 'test_utils.c' || echo '$(srcdir)/'`test_utils.c
|
||||
|
||||
test_utils-test_utils.obj: test_utils.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utils_CFLAGS) $(CFLAGS) -MT test_utils-test_utils.obj -MD -MP -MF "$(DEPDIR)/test_utils-test_utils.Tpo" -c -o test_utils-test_utils.obj `if test -f 'test_utils.c'; then $(CYGPATH_W) 'test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_utils-test_utils.Tpo" "$(DEPDIR)/test_utils-test_utils.Po"; else rm -f "$(DEPDIR)/test_utils-test_utils.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_utils.c' object='test_utils-test_utils.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utils_CFLAGS) $(CFLAGS) -c -o test_utils-test_utils.obj `if test -f 'test_utils.c'; then $(CYGPATH_W) 'test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils.c'; fi`
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
# Non-standard (but accepted) comment
|
||||
; standard ini comment
|
||||
|
||||
[check_mysql]
|
||||
username=operator
|
||||
password=secret # Remember to change later
|
||||
; comment in the middle
|
||||
password=secret
|
||||
|
||||
[section_twice]
|
||||
foo=bar
|
||||
|
|
|
|||
|
|
@ -5,3 +5,13 @@ foo=bar
|
|||
[section1]
|
||||
foobar=baz
|
||||
|
||||
; defaults for check_tcp
|
||||
[check_tcp]
|
||||
timeout = 10
|
||||
|
||||
[tcp_long_lines]
|
||||
escape =
|
||||
send = Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda
|
||||
expect = Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda
|
||||
jail=
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* $Id: test_base64.c 1927 2008-02-13 04:07:39Z dermoth $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* $Id$
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* $Id: test_disk.c 1914 2008-01-30 09:38:37Z dermoth $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
|
@ -220,5 +219,6 @@ np_test_mount_entry_regex (struct mount_entry *dummy_mount_list, char *regstr, i
|
|||
desc, regstr, expect, matches);
|
||||
|
||||
} else
|
||||
ok ( false, "regex '%s' not compileable", regstr);
|
||||
ok ( false, "regex '%s' not compilable", regstr);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* $Id: test_ini.c 1976 2008-04-04 10:11:22Z dermoth $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
|
@ -55,7 +54,7 @@ main (int argc, char **argv)
|
|||
{
|
||||
char *optstr=NULL;
|
||||
|
||||
plan_tests(11);
|
||||
plan_tests(12);
|
||||
|
||||
optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
|
||||
ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected");
|
||||
|
|
@ -65,14 +64,6 @@ main (int argc, char **argv)
|
|||
ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "Used default section name, without specific");
|
||||
my_free(optstr);
|
||||
|
||||
/*
|
||||
* This check is expected to die - It's commented so we can eventually put
|
||||
* it in a separate file for testing the return value
|
||||
*/
|
||||
/* optstr=list2str(np_get_defaults("section_unknown@./config-tiny.ini", "section"));
|
||||
ok( 0, "die if section isn't found");
|
||||
my_free(optstr); */
|
||||
|
||||
optstr=list2str(np_get_defaults("Section Two@./config-tiny.ini", "check_disk"));
|
||||
ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-tiny.ini's Section Two as expected");
|
||||
my_free(optstr);
|
||||
|
|
@ -109,6 +100,10 @@ main (int argc, char **argv)
|
|||
ok( !strcmp(optstr, "--foo=bar --bar=foo"), "plugin.ini's section_twice defined twice in the file");
|
||||
my_free(optstr);
|
||||
|
||||
optstr=list2str(np_get_defaults("tcp_long_lines@plugins.ini", "check_tcp"));
|
||||
ok( !strcmp(optstr, "--escape --send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --jail"), "Long options");
|
||||
my_free(optstr);
|
||||
|
||||
return exit_status();
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/perl
|
||||
use Test::More;
|
||||
if (! -e "./test_ini") {
|
||||
if (! -e "./test_ini1") {
|
||||
plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test";
|
||||
}
|
||||
exec "./test_ini";
|
||||
exec "./test_ini1";
|
||||
33
lib/tests/test_ini3.c
Normal file
33
lib/tests/test_ini3.c
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
/*****************************************************************************
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#include "parse_ini.h"
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
|
||||
/*
|
||||
* This is for testing arguments expected to die.
|
||||
*/
|
||||
|
||||
np_get_defaults(argv[1], argv[0]);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
34
lib/tests/test_ini3.t
Executable file
34
lib/tests/test_ini3.t
Executable file
|
|
@ -0,0 +1,34 @@
|
|||
#!/usr/bin/perl
|
||||
use Test::More;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
if (! -e "./test_ini3") {
|
||||
plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test";
|
||||
}
|
||||
|
||||
# array of argument arrays
|
||||
# - First value is the expected return code
|
||||
# - 2nd value is the NAGIOS_CONFIG_PATH
|
||||
# TODO: looks like we look in default path after looking trough this variable - shall we?
|
||||
# - 3rd value is the plugin name
|
||||
# - 4th is the ini locator
|
||||
my @TESTS = (
|
||||
[3, undef, "section", "section_unknown@./config-tiny.ini"],
|
||||
);
|
||||
|
||||
plan tests => scalar(@TESTS);
|
||||
|
||||
my $count=1;
|
||||
|
||||
foreach my $args (@TESTS) {
|
||||
my $rc = shift(@$args);
|
||||
if (my $env = shift(@$args)) {
|
||||
$ENV{"NAGIOS_CONFIG_PATH"} = $env;
|
||||
} else {
|
||||
delete($ENV{"NAGIOS_CONFIG_PATH"});
|
||||
}
|
||||
system {'./test_ini3'} @$args;
|
||||
cmp_ok($?>>8, '==', $rc, "Parse-ini die " . $count++);
|
||||
}
|
||||
|
||||
|
|
@ -1,278 +0,0 @@
|
|||
/*****************************************************************************
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* $Id: test_ini.c 1951 2008-03-16 18:10:47Z dermoth $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#include "common.h"
|
||||
#include "utils_base.h"
|
||||
#include "extra_opts.h"
|
||||
|
||||
#include "tap.h"
|
||||
|
||||
void my_free(int *argc, char **argv) {
|
||||
int i;
|
||||
printf (" Arg(%i): ", *argc);
|
||||
for (i=1; i<*argc; i++) printf ("'%s' ", argv[i]);
|
||||
printf ("\n");
|
||||
free(argv);
|
||||
*argc=0;
|
||||
}
|
||||
|
||||
int array_diff(int i1, char **a1, int i2, char **a2) {
|
||||
int i;
|
||||
|
||||
if (i1 != i2) {
|
||||
printf(" Argument count doesn't match!\n");
|
||||
return 0;
|
||||
}
|
||||
for (i=0; i<=i1; i++) {
|
||||
if (a1[i]==NULL && a2[i]==NULL) continue;
|
||||
if (a1[i]==NULL || a2[i]==NULL) {
|
||||
printf(" Argument # %i null in one array!\n", i);
|
||||
return 0;
|
||||
}
|
||||
if (strcmp(a1[i], a2[i])) {
|
||||
printf(" Argument # %i doesn't match!\n", i);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
char **argv_test=NULL, **argv_known=NULL;
|
||||
int i, argc_test;
|
||||
|
||||
plan_tests(9);
|
||||
|
||||
argv_test=(char **)malloc(2*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = NULL;
|
||||
argc_test=1;
|
||||
argv_known=(char **)realloc(argv_known, 2*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 1, argv_known), "No opts, returns correct argv/argc");
|
||||
my_free(&argc_test, argv_test);
|
||||
|
||||
argv_test=(char **)malloc(6*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "arg1";
|
||||
argv_test[2] = "--arg2=val1";
|
||||
argv_test[3] = "--arg3";
|
||||
argv_test[4] = "val2";
|
||||
argv_test[5] = NULL;
|
||||
argc_test=5;
|
||||
argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "arg1";
|
||||
argv_known[2] = "--arg2=val1";
|
||||
argv_known[3] = "--arg3";
|
||||
argv_known[4] = "val2";
|
||||
argv_known[5] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 5, argv_known), "No extra opts, verbatim copy of argv");
|
||||
my_free(&argc_test,argv_test);
|
||||
|
||||
argv_test=(char **)malloc(3*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "--extra-opts=@./config-opts.ini";
|
||||
argv_test[2] = NULL;
|
||||
argc_test=2;
|
||||
argv_known=(char **)realloc(argv_known, 5*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "--foo=Bar";
|
||||
argv_known[2] = "--this=Your Mother!";
|
||||
argv_known[3] = "--blank";
|
||||
argv_known[4] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 4, argv_known), "Only extra opts using default section");
|
||||
my_free(&argc_test,argv_test);
|
||||
|
||||
argv_test=(char **)malloc(5*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "--extra-opts=sect1@./config-opts.ini";
|
||||
argv_test[2] = "--extra-opts";
|
||||
argv_test[3] = "sect2@./config-opts.ini";
|
||||
argv_test[4] = NULL;
|
||||
argc_test=4;
|
||||
argv_known=(char **)realloc(argv_known, 5*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "--one=two";
|
||||
argv_known[2] = "--something else=oops";
|
||||
argv_known[3] = "--this=that";
|
||||
argv_known[4] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 4, argv_known), "Only extra opts specified twice");
|
||||
my_free(&argc_test,argv_test);
|
||||
|
||||
argv_test=(char **)malloc(7*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "--arg1=val1";
|
||||
argv_test[2] = "--extra-opts=@./config-opts.ini";
|
||||
argv_test[3] = "--extra-opts";
|
||||
argv_test[4] = "sect1@./config-opts.ini";
|
||||
argv_test[5] = "--arg2";
|
||||
argv_test[6] = NULL;
|
||||
argc_test=6;
|
||||
argv_known=(char **)realloc(argv_known, 8*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "--foo=Bar";
|
||||
argv_known[2] = "--this=Your Mother!";
|
||||
argv_known[3] = "--blank";
|
||||
argv_known[4] = "--one=two";
|
||||
argv_known[5] = "--arg1=val1";
|
||||
argv_known[6] = "--arg2";
|
||||
argv_known[7] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 7, argv_known), "twice extra opts using two sections");
|
||||
my_free(&argc_test,argv_test);
|
||||
|
||||
/* Next three checks dre expected to die. They are commented out as they
|
||||
* could possibly go in a sepatare test checked for return value.
|
||||
*/
|
||||
/* argv_test=(char **)malloc(6*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "arg1";
|
||||
argv_test[2] = "--extra-opts=missing@./config-opts.ini";
|
||||
argv_test[3] = "--arg3";
|
||||
argv_test[4] = "val2";
|
||||
argv_test[5] = NULL;
|
||||
argc_test=5;
|
||||
argv_known=(char **)realloc(argv_known, 5*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "arg1";
|
||||
argv_known[2] = "--arg3";
|
||||
argv_known[3] = "val2";
|
||||
argv_known[4] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_missing");
|
||||
ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 1");
|
||||
my_free(&argc_test,argv_test); */
|
||||
|
||||
/* argv_test=(char **)malloc(7*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "arg1";
|
||||
argv_test[2] = "--extra-opts";
|
||||
argv_test[3] = "missing@./config-opts.ini";
|
||||
argv_test[4] = "--arg3";
|
||||
argv_test[5] = "val2";
|
||||
argv_test[6] = NULL;
|
||||
argc_test=6;
|
||||
argv_known=(char **)realloc(argv_known, 5*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "arg1";
|
||||
argv_known[2] = "--arg3";
|
||||
argv_known[3] = "val2";
|
||||
argv_known[4] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_missing");
|
||||
ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 2");
|
||||
my_free(&argc_test,argv_test); */
|
||||
|
||||
/* argv_test=(char **)malloc(6*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "arg1";
|
||||
argv_test[2] = "--extra-opts";
|
||||
argv_test[3] = "--arg3";
|
||||
argv_test[4] = "val2";
|
||||
argv_test[5] = NULL;
|
||||
argc_test=5;
|
||||
argv_known=(char **)realloc(argv_known, 5*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "arg1";
|
||||
argv_known[2] = "--arg3";
|
||||
argv_known[3] = "val2";
|
||||
argv_known[4] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_missing");
|
||||
ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 3");
|
||||
my_free(&argc_test,argv_test); */
|
||||
|
||||
setenv("NAGIOS_CONFIG_PATH", ".", 1);
|
||||
argv_test=(char **)malloc(6*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "arg1";
|
||||
argv_test[2] = "--extra-opts";
|
||||
argv_test[3] = "--arg3";
|
||||
argv_test[4] = "val2";
|
||||
argv_test[5] = NULL;
|
||||
argc_test=5;
|
||||
argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "--foo=bar";
|
||||
argv_known[2] = "arg1";
|
||||
argv_known[3] = "--arg3";
|
||||
argv_known[4] = "val2";
|
||||
argv_known[5] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 1");
|
||||
|
||||
argv_test=(char **)malloc(3*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "--extra-opts";
|
||||
argv_test[2] = NULL;
|
||||
argc_test=2;
|
||||
argv_known=(char **)realloc(argv_known, 3*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "--foo=bar";
|
||||
argv_known[2] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 2, argv_known), "Default section 2");
|
||||
my_free(&argc_test,argv_test);
|
||||
|
||||
argv_test=(char **)malloc(6*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "arg1";
|
||||
argv_test[2] = "--extra-opts=section1";
|
||||
argv_test[3] = "--arg3";
|
||||
argv_test[4] = "val2";
|
||||
argv_test[5] = NULL;
|
||||
argc_test=5;
|
||||
argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "--foobar=baz";
|
||||
argv_known[2] = "arg1";
|
||||
argv_known[3] = "--arg3";
|
||||
argv_known[4] = "val2";
|
||||
argv_known[5] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 3");
|
||||
my_free(&argc_test,argv_test);
|
||||
|
||||
argv_test=(char **)malloc(6*sizeof(char **));
|
||||
argv_test[0] = "prog_name";
|
||||
argv_test[1] = "arg1";
|
||||
argv_test[2] = "--extra-opts";
|
||||
argv_test[3] = "-arg3";
|
||||
argv_test[4] = "val2";
|
||||
argv_test[5] = NULL;
|
||||
argc_test=5;
|
||||
argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
|
||||
argv_known[0] = "prog_name";
|
||||
argv_known[1] = "--foo=bar";
|
||||
argv_known[2] = "arg1";
|
||||
argv_known[3] = "-arg3";
|
||||
argv_known[4] = "val2";
|
||||
argv_known[5] = NULL;
|
||||
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 4");
|
||||
my_free(&argc_test,argv_test);
|
||||
|
||||
return exit_status();
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#!/usr/bin/perl
|
||||
use Test::More;
|
||||
if (! -e "./test_opts") {
|
||||
plan skip_all => "./test_opts not compiled - please install tap library and/or enable parse-ini to test";
|
||||
}
|
||||
exec "./test_opts";
|
||||
139
lib/tests/test_opts1.c
Normal file
139
lib/tests/test_opts1.c
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
/*****************************************************************************
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#include "common.h"
|
||||
#include "utils_base.h"
|
||||
#include "extra_opts.h"
|
||||
|
||||
#include "tap.h"
|
||||
|
||||
/* This my_free would be the most efficient way of freeing an extra-opts array,
|
||||
* provided as an example */
|
||||
#if 0
|
||||
void my_free(int *argc, char **newargv, char **argv) {
|
||||
int i;
|
||||
/* Return if both arrays are the same */
|
||||
if (newargv == argv) return;
|
||||
|
||||
for (i=1; i<*argc; i++) {
|
||||
/* Free array items until we reach the start of the original argv */
|
||||
if (newargv[i] == argv[1]) break;
|
||||
free(newargv[i]);
|
||||
}
|
||||
/* Free the array itself */
|
||||
free(newargv);
|
||||
}
|
||||
#else
|
||||
void my_free(int *argc, char **newargv, char **argv) {
|
||||
/* Free stuff (and print while we're at it) */
|
||||
int i, freeflag=1;
|
||||
printf (" Arg(%i): ", *argc+1);
|
||||
printf ("'%s' ", newargv[0]);
|
||||
for (i=1; i<*argc; i++) {
|
||||
printf ("'%s' ", newargv[i]);
|
||||
/* Stop freeing when we get to the start of the original array */
|
||||
if (freeflag) {
|
||||
if (newargv[i] == argv[1])
|
||||
freeflag=0;
|
||||
else
|
||||
free(newargv[i]);
|
||||
}
|
||||
}
|
||||
printf ("\n");
|
||||
/* Free only if it's a different array */
|
||||
if (newargv != argv) free(newargv);
|
||||
*argc=0;
|
||||
}
|
||||
#endif
|
||||
|
||||
int array_diff(int i1, char **a1, int i2, char **a2) {
|
||||
int i;
|
||||
|
||||
if (i1 != i2) {
|
||||
printf(" Argument count doesn't match!\n");
|
||||
return 0;
|
||||
}
|
||||
for (i=0; i<=i1; i++) {
|
||||
if (a1[i]==NULL && a2[i]==NULL) continue;
|
||||
if (a1[i]==NULL || a2[i]==NULL) {
|
||||
printf(" Argument # %i null in one array!\n", i);
|
||||
return 0;
|
||||
}
|
||||
if (strcmp(a1[i], a2[i])) {
|
||||
printf(" Argument # %i doesn't match!\n", i);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
char **argv_new=NULL;
|
||||
int i, argc_test;
|
||||
|
||||
plan_tests(5);
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", (char *) NULL};
|
||||
argc_test=1;
|
||||
char *argv_known[] = {"prog_name", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 1, argv_known), "No opts, returns correct argv/argc");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
|
||||
argc_test=5;
|
||||
char *argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 5, argv_known), "No extra opts, verbatim copy of argv");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char *) NULL};
|
||||
argc_test=2;
|
||||
char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts using default section");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts", "sect2@./config-opts.ini", (char *) NULL};
|
||||
argc_test=4;
|
||||
char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts specified twice");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", "--arg1=val1", "--extra-opts=@./config-opts.ini", "--extra-opts", "sect1@./config-opts.ini", "--arg2", (char *) NULL};
|
||||
argc_test=6;
|
||||
char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", "--one=two", "--arg1=val1", "--arg2", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 7, argv_known), "twice extra opts using two sections");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
return exit_status();
|
||||
}
|
||||
|
||||
6
lib/tests/test_opts1.t
Executable file
6
lib/tests/test_opts1.t
Executable file
|
|
@ -0,0 +1,6 @@
|
|||
#!/usr/bin/perl
|
||||
use Test::More;
|
||||
if (! -e "./test_opts1") {
|
||||
plan skip_all => "./test_opts1 not compiled - please install tap library and/or enable parse-ini to test";
|
||||
}
|
||||
exec "./test_opts1";
|
||||
121
lib/tests/test_opts2.c
Normal file
121
lib/tests/test_opts2.c
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
/*****************************************************************************
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#include "common.h"
|
||||
#include "utils_base.h"
|
||||
#include "extra_opts.h"
|
||||
|
||||
#include "tap.h"
|
||||
|
||||
void my_free(int *argc, char **newargv, char **argv) {
|
||||
/* Free stuff (and print while we're at it) */
|
||||
int i, freeflag=1;
|
||||
printf (" Arg(%i): ", *argc+1);
|
||||
printf ("'%s' ", newargv[0]);
|
||||
for (i=1; i<*argc; i++) {
|
||||
printf ("'%s' ", newargv[i]);
|
||||
/* Stop freeing when we get to the start of the original array */
|
||||
if (freeflag) {
|
||||
if (newargv[i] == argv[1])
|
||||
freeflag=0;
|
||||
else
|
||||
free(newargv[i]);
|
||||
}
|
||||
}
|
||||
printf ("\n");
|
||||
/* Free only if it's a different array */
|
||||
if (newargv != argv) free(newargv);
|
||||
*argc=0;
|
||||
}
|
||||
|
||||
int array_diff(int i1, char **a1, int i2, char **a2) {
|
||||
int i;
|
||||
|
||||
if (i1 != i2) {
|
||||
printf(" Argument count doesn't match!\n");
|
||||
return 0;
|
||||
}
|
||||
for (i=0; i<=i1; i++) {
|
||||
if (a1[i]==NULL && a2[i]==NULL) continue;
|
||||
if (a1[i]==NULL || a2[i]==NULL) {
|
||||
printf(" Argument # %i null in one array!\n", i);
|
||||
return 0;
|
||||
}
|
||||
if (strcmp(a1[i], a2[i])) {
|
||||
printf(" Argument # %i doesn't match!\n", i);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
char **argv_new=NULL;
|
||||
int i, argc_test;
|
||||
|
||||
plan_tests(5);
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "--arg3", "val2", (char *) NULL};
|
||||
argc_test=5;
|
||||
char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "--arg3", "val2", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 1");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", "--extra-opts", (char *) NULL};
|
||||
argc_test=2;
|
||||
char *argv_known[] = {"prog_name", "--foo=bar", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 2, argv_known), "Default section 2");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", "arg1", "--extra-opts=section1", "--arg3", "val2", (char *) NULL};
|
||||
argc_test=5;
|
||||
char *argv_known[] = {"prog_name", "--foobar=baz", "arg1", "--arg3", "val2", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 3");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
{
|
||||
char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "-arg3", "val2", (char *) NULL};
|
||||
argc_test=5;
|
||||
char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "-arg3", "val2", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
|
||||
ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 4");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
{
|
||||
char *argv_test[] = {"check_tcp", "--extra-opts", "--extra-opts=tcp_long_lines", (char *) NULL};
|
||||
argc_test=3;
|
||||
char *argv_known[] = {"check_tcp", "--timeout=10", "--escape", "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda", "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda", "--jail", (char *) NULL};
|
||||
argv_new=np_extra_opts(&argc_test, argv_test, "check_tcp");
|
||||
ok(array_diff(argc_test, argv_new, 6, argv_known), "Long lines test");
|
||||
my_free(&argc_test, argv_new, argv_test);
|
||||
}
|
||||
|
||||
return exit_status();
|
||||
}
|
||||
|
||||
7
lib/tests/test_opts2.t
Executable file
7
lib/tests/test_opts2.t
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/usr/bin/perl
|
||||
use Test::More;
|
||||
if (! -e "./test_opts2") {
|
||||
plan skip_all => "./test_opts2 not compiled - please install tap library and/or enable parse-ini to test";
|
||||
}
|
||||
$ENV{"NAGIOS_CONFIG_PATH"} = ".";
|
||||
exec "./test_opts2";
|
||||
31
lib/tests/test_opts3.c
Normal file
31
lib/tests/test_opts3.c
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
/*****************************************************************************
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#include "extra_opts.h"
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
|
||||
/*
|
||||
* This is for testing arguments expected to die.
|
||||
*/
|
||||
argv=np_extra_opts(&argc, argv, argv[0]);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
40
lib/tests/test_opts3.t
Executable file
40
lib/tests/test_opts3.t
Executable file
|
|
@ -0,0 +1,40 @@
|
|||
#!/usr/bin/perl
|
||||
use Test::More;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
if (! -e "./test_opts3") {
|
||||
plan skip_all => "./test_opts3 not compiled - please install tap library and/or enable parse-ini to test";
|
||||
}
|
||||
|
||||
# array of argument arrays
|
||||
# - First value is the expected return code
|
||||
# - 2nd value is the NAGIOS_CONFIG_PATH
|
||||
# TODO: looks like we look in default path after looking trough this variable - shall we?
|
||||
# - 3rd value is the plugin name
|
||||
# - 4th and up are arguments
|
||||
my @TESTS = (
|
||||
[3, '/nonexistent', 'prog_name', 'arg1', '--extra-opts', '--arg3', 'val2'],
|
||||
[3, '.', 'prog_name', 'arg1', '--extra-opts=missing@./config-opts.ini', '--arg3', 'val2'],
|
||||
[3, '', 'prog_name', 'arg1', '--extra-opts', 'missing@./config-opts.ini', '--arg3', 'val2'],
|
||||
[3, '.', 'check_missing', 'arg1', '--extra-opts=@./config-opts.ini', '--arg3', 'val2'],
|
||||
[3, '.', 'check_missing', 'arg1', '--extra-opts', '--arg3', 'val2'],
|
||||
[0, '/tmp:/var:/nonexistent:.', 'check_tcp', 'arg1', '--extra-opts', '--arg3', 'val2'],
|
||||
[0, '/usr/local/nagios/etc:.:/etc', 'check_missing', 'arg1', '--extra-opts=check_tcp', '--arg3', 'val2'],
|
||||
);
|
||||
|
||||
plan tests => scalar(@TESTS);
|
||||
|
||||
my $count=1;
|
||||
|
||||
foreach my $args (@TESTS) {
|
||||
my $rc = shift(@$args);
|
||||
if (my $env = shift(@$args)) {
|
||||
$ENV{"NAGIOS_CONFIG_PATH"} = $env;
|
||||
} else {
|
||||
delete($ENV{"NAGIOS_CONFIG_PATH"});
|
||||
}
|
||||
system {'./test_opts3'} @$args;
|
||||
cmp_ok($?>>8, '==', $rc, "Extra-opts die " . $count++);
|
||||
}
|
||||
|
||||
|
|
@ -13,7 +13,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* $Id: test_tcp.c 1914 2008-01-30 09:38:37Z dermoth $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* $Id: test_utils.c 1914 2008-01-30 09:38:37Z dermoth $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
|
@ -30,7 +29,7 @@ main (int argc, char **argv)
|
|||
thresholds *thresholds = NULL;
|
||||
int rc;
|
||||
|
||||
plan_tests(82);
|
||||
plan_tests(81+23);
|
||||
|
||||
range = parse_range_string("6");
|
||||
ok( range != NULL, "'6' is valid range");
|
||||
|
|
@ -172,10 +171,85 @@ main (int argc, char **argv)
|
|||
|
||||
test = np_escaped_string("everything");
|
||||
ok( strcmp(test, "everything") == 0, "everything okay");
|
||||
|
||||
/* np_extract_ntpvar tests (23) */
|
||||
test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foo");
|
||||
ok(test && !strcmp(test, "bar"), "1st test as expected");
|
||||
free(test);
|
||||
|
||||
test = basename("/here/is/a/path");
|
||||
ok( strcmp(test, "path") == 0, "basename okay");
|
||||
test=np_extract_ntpvar("foo=bar,bar=foo,foobar=barfoo\n", "bar");
|
||||
ok(test && !strcmp(test, "foo"), "2nd test as expected");
|
||||
free(test);
|
||||
|
||||
test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foobar");
|
||||
ok(test && !strcmp(test, "barfoo"), "3rd test as expected");
|
||||
free(test);
|
||||
|
||||
test=np_extract_ntpvar("foo=bar\n", "foo");
|
||||
ok(test && !strcmp(test, "bar"), "Single test as expected");
|
||||
free(test);
|
||||
|
||||
test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfooi\n", "abcd");
|
||||
ok(!test, "Key not found 1");
|
||||
|
||||
test=np_extract_ntpvar("foo=bar\n", "abcd");
|
||||
ok(!test, "Key not found 2");
|
||||
|
||||
test=np_extract_ntpvar("foo=bar=foobar", "foo");
|
||||
ok(test && !strcmp(test, "bar=foobar"), "Strange string 1");
|
||||
free(test);
|
||||
|
||||
test=np_extract_ntpvar("foo", "foo");
|
||||
ok(!test, "Malformed string 1");
|
||||
|
||||
test=np_extract_ntpvar("foo,", "foo");
|
||||
ok(!test, "Malformed string 2");
|
||||
|
||||
test=np_extract_ntpvar("foo=", "foo");
|
||||
ok(!test, "Malformed string 3");
|
||||
|
||||
test=np_extract_ntpvar("foo=,bar=foo", "foo");
|
||||
ok(!test, "Malformed string 4");
|
||||
|
||||
test=np_extract_ntpvar(",foo", "foo");
|
||||
ok(!test, "Malformed string 5");
|
||||
|
||||
test=np_extract_ntpvar("=foo", "foo");
|
||||
ok(!test, "Malformed string 6");
|
||||
|
||||
test=np_extract_ntpvar("=foo,", "foo");
|
||||
ok(!test, "Malformed string 7");
|
||||
|
||||
test=np_extract_ntpvar(",,,", "foo");
|
||||
ok(!test, "Malformed string 8");
|
||||
|
||||
test=np_extract_ntpvar("===", "foo");
|
||||
ok(!test, "Malformed string 9");
|
||||
|
||||
test=np_extract_ntpvar(",=,=,", "foo");
|
||||
ok(!test, "Malformed string 10");
|
||||
|
||||
test=np_extract_ntpvar("=,=,=", "foo");
|
||||
ok(!test, "Malformed string 11");
|
||||
|
||||
test=np_extract_ntpvar(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "foo");
|
||||
ok(test && !strcmp(test, "bar"), "Random spaces and newlines 1");
|
||||
free(test);
|
||||
|
||||
test=np_extract_ntpvar(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "bar");
|
||||
ok(test && !strcmp(test, "foo"), "Random spaces and newlines 2");
|
||||
free(test);
|
||||
|
||||
test=np_extract_ntpvar(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "foobar");
|
||||
ok(test && !strcmp(test, "barfoo"), "Random spaces and newlines 3");
|
||||
free(test);
|
||||
|
||||
test=np_extract_ntpvar(" foo=bar ,\n bar\n \n= \n foo\n , foobar=barfoo \n ", "bar");
|
||||
ok(test && !strcmp(test, "foo"), "Random spaces and newlines 4");
|
||||
free(test);
|
||||
|
||||
test=np_extract_ntpvar("", "foo");
|
||||
ok(!test, "Empty string return NULL");
|
||||
|
||||
return exit_status();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue