upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-05-28 04:35:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add die tests for extra-opts

Browse source
This commit is contained in:
Thomas Guyot-Sionnest 2009-01-21 01:27:06 -05:00
parent a4647be424
commit bf4abd5395
7 changed files with 74 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -96,6 +96,7 @@ NP-VERSION-FILE
/lib/tests/test_ini
/lib/tests/test_opts1
/lib/tests/test_opts2
/lib/tests/test_opts3
/lib/tests/extra_opts.Po
# /m4/

2
configure.in
View file

@ -188,7 +188,7 @@ AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
if test "$enable_extra_opts" = "yes" ; then
AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
if test "$enable_libtap" = "yes"; then
EXTRA_TEST="$EXTRA_TEST test_ini test_opts1 test_opts2"
EXTRA_TEST="$EXTRA_TEST test_ini test_opts1 test_opts2 test_opts3"
AC_SUBST(EXTRA_TEST)
fi
fi

6
lib/tests/Makefile.am
View file

@ -7,9 +7,9 @@ check_PROGRAMS = @EXTRA_TEST@
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini test_opts1 test_opts2
EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini test_opts1 test_opts2 test_opts3
np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini.t test_opts1.t test_opts2.t test_tcp.t test_utils.t
np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini.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)
@ -28,7 +28,7 @@ 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_ini.c test_opts1.c test_opts2.c
SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.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)

8
lib/tests/test_opts1.c
View file

@ -1,18 +1,18 @@
/*****************************************************************************
*
*
* 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"

6
lib/tests/test_opts2.c
View file

@ -1,15 +1,15 @@
/*****************************************************************************
*
*
* 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/>.
*

31
lib/tests/test_opts3.c Normal file
View 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;
}

31
lib/tests/test_opts3.t Executable file
View file

@ -0,0 +1,31 @@
#!/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 NAGIOS_CONFIG_PATH
# - 2nd value is the plugin name
# - 3rc and up are arguments
my @TESTS = (
['/nonexistent', 'prog_name', 'arg1', '--extra-opts', '--arg3', 'val2'],
['.', 'prog_name', 'arg1', '--extra-opts=missing@./config-opts.ini', '--arg3', 'val2'],
['.', 'prog_name', 'arg1', '--extra-opts', 'missing@./config-opts.ini', '--arg3', 'val2'],
['.', 'check_missing', 'arg1', '--extra-opts=@./config-opts.ini', '--arg3', 'val2'],
['.', 'check_missing', 'arg1', '--extra-opts', '--arg3', 'val2'],
);
plan tests => scalar(@TESTS);
my $count=1;
foreach my $args (@TESTS) {
$ENV{"NAGIOS_CONFIG_PATH"} = shift(@$args);
system {'./test_opts3'} @$args;
cmp_ok($?>>8, '==', 3, "Extra-opts die " . $count++);
}