diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/parse_ini.c | 4 | ||||
| -rw-r--r-- | lib/tests/Makefile.am | 16 | ||||
| -rwxr-xr-x | lib/tests/test_ini.t | 2 | ||||
| -rwxr-xr-x | lib/tests/test_opts.t | 2 |
5 files changed, 23 insertions, 7 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 5d65bed6..73c12911 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -6,7 +6,11 @@ noinst_LIBRARIES = libnagiosplug.a libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c -EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h +EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h + +if USE_PARSE_INI +libnagiosplug_a_SOURCES += parse_ini.c extra_opts.c +endif USE_PARSE_INI INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins diff --git a/lib/parse_ini.c b/lib/parse_ini.c index aaba03e0..d5661c9e 100644 --- a/lib/parse_ini.c +++ b/lib/parse_ini.c @@ -34,8 +34,8 @@ #include <sys/stat.h> #include <unistd.h> -/* FIXME: N::P dies if section is not found */ -/* FIXME: N::P dies if config file is not found */ +/* TODO: die like N::P if section is not found */ +/* TODO: die like N::P if config file is not found */ /* np_ini_info contains the result of parsing a "locator" in the format * [stanza_name][@config_filename] (check_foo@/etc/foo.ini, for example) diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index bd25ccfe..25e2bed3 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -7,9 +7,11 @@ 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 test_base64 test_ini test_opts -EXTRA_DIST = test_utils.t test_disk.t test_tcp.t test_cmd.t test_base64.t +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_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini +EXTRA_DIST = $(np_test_scripts) $(np_test_files) LIBS = @LIBINTL@ @@ -38,6 +40,16 @@ 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 + test: ${noinst_PROGRAMS} perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) diff --git a/lib/tests/test_ini.t b/lib/tests/test_ini.t index b130a01b..0487098c 100755 --- a/lib/tests/test_ini.t +++ b/lib/tests/test_ini.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_ini") { - plan skip_all => "./test_ini not compiled - please install tap library to test"; + plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test"; } exec "./test_ini"; diff --git a/lib/tests/test_opts.t b/lib/tests/test_opts.t index 86a5b21a..d69b8f1d 100755 --- a/lib/tests/test_opts.t +++ b/lib/tests/test_opts.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_opts") { - plan skip_all => "./test_opts not compiled - please install tap library to test"; + plan skip_all => "./test_opts not compiled - please install tap library and/or enable parse-ini to test"; } exec "./test_opts"; |