upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-06-09 08:42:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some platform are missing setenv

Browse source 
Instead of adding the gnulib module for solving tests only I split the test
in two, setting environment from Perl for the later.
This commit is contained in:
Thomas Guyot-Sionnest 2009-01-20 23:55:34 -05:00
parent 26bf63a5bb
commit 3b69f13467
9 changed files with 169 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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_opts"
EXTRA_TEST="$EXTRA_TEST test_ini test_opts1 test_opts2"
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_opts
EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini test_opts1 test_opts2
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_ini.t test_opts1.t test_opts2.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_opts.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: ${noinst_PROGRAMS}
perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)

6
lib/tests/test_opts.t
View file

@ -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";

BIN
lib/tests/test_opts1 Executable file
View file

Binary file not shown.

90
lib/tests/test_opts.c → lib/tests/test_opts1.c
View file

@ -57,7 +57,7 @@ main (int argc, char **argv)
char **argv_test=NULL, **argv_known=NULL;
int i, argc_test;
plan_tests(10);
plan_tests(5);
argv_test=(char **)malloc(2*sizeof(char **));
argv_test[0] = "prog_name";
@ -201,94 +201,6 @@ main (int argc, char **argv)
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);
argv_test=(char **)malloc(4*sizeof(char **));
argv_test[0] = "check_tcp";
argv_test[1] = "--extra-opts";
argv_test[2] = "--extra-opts=tcp_long_lines";
argv_test[3] = NULL;
argc_test=3;
argv_known=(char **)realloc(argv_known, 7*sizeof(char **));
argv_known[0] = "check_tcp";
argv_known[1] = "--timeout=10";
argv_known[2] = "--escape";
argv_known[3] = "--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";
argv_known[4] = "--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";
argv_known[5] = "--jail";
argv_known[6] = NULL;
argv_test=np_extra_opts(&argc_test, argv_test, "check_tcp");
ok(array_diff(argc_test, argv_test, 6, argv_known), "Long lines test");
my_free(&argc_test,argv_test);
return exit_status();
}

6
lib/tests/test_opts1.t Executable file
View 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";

BIN
lib/tests/test_opts2 Executable file
View file

Binary file not shown.

151
lib/tests/test_opts2.c Normal file
View file

@ -0,0 +1,151 @@
/*****************************************************************************
*
* 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 **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(5);
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);
argv_test=(char **)malloc(4*sizeof(char **));
argv_test[0] = "check_tcp";
argv_test[1] = "--extra-opts";
argv_test[2] = "--extra-opts=tcp_long_lines";
argv_test[3] = NULL;
argc_test=3;
argv_known=(char **)realloc(argv_known, 7*sizeof(char **));
argv_known[0] = "check_tcp";
argv_known[1] = "--timeout=10";
argv_known[2] = "--escape";
argv_known[3] = "--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";
argv_known[4] = "--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";
argv_known[5] = "--jail";
argv_known[6] = NULL;
argv_test=np_extra_opts(&argc_test, argv_test, "check_tcp");
ok(array_diff(argc_test, argv_test, 6, argv_known), "Long lines test");
my_free(&argc_test,argv_test);
return exit_status();
}

7
lib/tests/test_opts2.t Executable file
View 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";