Nagios

Email Archive: nagios-checkins (read-only)

2002:	_Jan	_Feb (12)	_Mar (51)	_Apr (30)	_May (66)	_Jun (43)	_Jul (41)	_Aug (35)	_Sep (18)	_Oct (36)	_Nov (19)	_Dec (87)
2003:	_Jan (72)	_Feb (54)	_Mar (24)	_Apr (65)	_May (44)	_Jun (62)	_Jul (44)	_Aug (50)	_Sep (38)	_Oct (47)	_Nov (32)	_Dec (10)
2004:	_Jan (31)	_Feb (36)	_Mar (22)	_Apr (5)	_May (10)	_Jun (4)	_Jul	_Aug (15)	_Sep (8)	_Oct (69)	_Nov (18)	_Dec (30)
2005:	_Jan (14)	_Feb (12)	_Mar (39)	_Apr (18)	_May (17)	_Jun (7)	_Jul (6)	_Aug (20)	_Sep	_Oct (3)	_Nov (62)	_Dec (40)
2006:	_Jan (38)	_Feb (85)	_Mar (83)	_Apr (46)	_May (90)	_Jun (11)	_Jul (24)	_Aug (7)	_Sep (5)	_Oct (40)	_Nov (27)	_Dec (55)
2007:	_Jan (73)	_Feb (81)	_Mar (116)	_Apr (93)	_May (52)	_Jun (27)	_Jul (49)	_Aug (75)	_Sep (56)	_Oct (202)	_Nov (60)	_Dec (37)
2008:	_Jan (59)	_Feb (53)	_Mar (21)	_Apr (17)	_May (21)	_Jun (15)	_Jul	_Aug	_Sep	_Oct (25)	_Nov (53)	_Dec (33)
2009:	_Jan (36)	_Feb	_Mar (3)	_Apr (3)	_May (125)	_Jun (69)	_Jul (50)	_Aug (47)	_Sep (38)	_Oct (23)	_Nov (6)	_Dec (11)
2010:	_Jan (12)	_Feb (4)	_Mar (20)	_Apr	_May (2)	_Jun (8)	_Jul	_Aug (79)	_Sep (27)	_Oct (115)	_Nov (42)	_Dec (66)
2011:	_Jan (63)	_Feb (29)	_Mar (4)	_Apr (7)	_May (14)	_Jun (11)	_Jul (19)	_Aug (31)	_Sep (12)	_Oct (11)	_Nov (22)	_Dec (11)
2012:	_Jan (16)	_Feb (40)	_Mar (2)	_Apr (11)	_May (17)	_Jun (34)	_Jul (42)	_Aug (101)	_Sep (173)	_Oct (146)	_Nov (55)	_Dec (51)
2013:	_Jan (32)	_Feb (59)	_Mar (66)	_Apr (41)	_May (12)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[Nagios-checkins] SF.net SVN: nagios:[2641] nagioscore/trunk/lib/test-runcmd.c

From: <ageric@us...> - 2013-02-27 14:49

Revision: 2641
          http://nagios.svn.sourceforge.net/nagios/?rev=2641&view=rev
Author:   ageric
Date:     2013-02-27 14:49:35 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
lib/test-runcmd: Make test-failures cause "build" failures

This makes these tests infinitely more useful from buildbots and
whatnot.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/lib/test-runcmd.c

Modified: nagioscore/trunk/lib/test-runcmd.c
===================================================================
--- nagioscore/trunk/lib/test-runcmd.c	2013-02-27 14:49:14 UTC (rev 2640)
+++ nagioscore/trunk/lib/test-runcmd.c	2013-02-27 14:49:35 UTC (rev 2641)
@@ -53,5 +53,5 @@
 		}
 	}
 	t_end();
-	return 0;
+	return t_end();
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nagios-checkins] SF.net SVN: nagios:[2642] nagioscore/trunk/lib/test-runcmd.c

From: <ageric@us...> - 2013-02-27 14:49

Revision: 2642
          http://nagios.svn.sourceforge.net/nagios/?rev=2642&view=rev
Author:   ageric
Date:     2013-02-27 14:49:53 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
lib/test-runcmd: Add anomaly detection tests

These are the tests responsible for the earlier flurry of commits.
Since they've already proven useful, we keep them around in an
easily runnable state.

While at it, rename "runcmd test" to "exec output comparison".

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/lib/test-runcmd.c

Modified: nagioscore/trunk/lib/test-runcmd.c
===================================================================
--- nagioscore/trunk/lib/test-runcmd.c	2013-02-27 14:49:35 UTC (rev 2641)
+++ nagioscore/trunk/lib/test-runcmd.c	2013-02-27 14:49:53 UTC (rev 2642)
@@ -30,11 +30,44 @@
 	{NULL},
 };
 
+struct {
+	int ret;
+	char *cmd;
+} anomaly[] = {
+	{ CMD_HAS_REDIR, "cat lala | grep foo" },
+	{ 0, "cat lala \\| grep foo" },
+	{ CMD_HAS_JOBCONTROL, "foo && bar" },
+	{ 0, "foo \\&\\& bar" },
+	{ CMD_HAS_JOBCONTROL, "foo & bar" },
+	{ 0, "foo \\& bar" },
+	{ CMD_HAS_SUBCOMMAND, "foo \"`extcmd`\"" },
+	{ 0, "foo \"\\`extcmd\\`\"" },
+	{ CMD_HAS_SUBCOMMAND, "foo `extcmd`" },
+	{ 0, "foo \\`extcmd\\`" },
+	{ CMD_HAS_SUBCOMMAND, "foo \"$(extcmd)\"" },
+	{ 0, "foo \\$\\(extcmd\\)" },
+	{ CMD_HAS_SUBCOMMAND | CMD_HAS_PAREN, "foo $(extcmd" },
+	{ 0, "foo \\$\\(extcmd\\)" },
+	{ CMD_HAS_UBDQ, "foo\" bar" },
+	{ 0, "foo\\\" bar" },
+	{ CMD_HAS_UBSQ, "foo' bar" },
+	{ 0, "foo\\' bar" },
+	{ CMD_HAS_WILDCARD, "ls -l /tmp/*" },
+	{ 0, "ls -l /tmp/\\*" },
+	{ CMD_HAS_WILDCARD, "ls -l /dev/tty?" },
+	{ 0, "ls -l /dev/tty\\?" },
+	{ CMD_HAS_SHVAR, "echo $foo" },
+	{ 0, "echo \\$foo" },
+	{ 0, NULL},
+};
+
 int main(int argc, char **argv)
 {
+	int ret, r2;
+
 	runcmd_init();
 	t_set_colors(0);
-	t_start("runcmd test");
+	t_start("exec output comparison");
 	{
 		int i;
 		char *out = calloc(1, BUF_SIZE);
@@ -52,6 +85,18 @@
 			close(fd);
 		}
 	}
-	t_end();
-	return t_end();
+	ret = t_end();
+	t_reset();
+	t_start("anomaly detection");
+	{
+		int i;
+		for (i = 0; anomaly[i].cmd; i++) {
+			int out_argc;
+			char *out_argv[256];
+			int ret = runcmd_cmd2strv(anomaly[i].cmd, &out_argc, out_argv);
+			ok_int(ret, anomaly[i].ret, anomaly[i].cmd);
+		}
+	}
+	r2 = t_end();
+	return r2 ? r2 : ret;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nagios-checkins] SF.net SVN: nagios:[2643] nagioscore/trunk/lib/test-runcmd.c

From: <ageric@us...> - 2013-02-27 14:50

Revision: 2643
          http://nagios.svn.sourceforge.net/nagios/?rev=2643&view=rev
Author:   ageric
Date:     2013-02-27 14:50:10 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
lib/test-runcmd: Add argument-splitting tests

This is just an embryo (or zygote, even) of a real testsuite for
argument splitting, but since tests tend to get written when
there's a comfortable framework to put them in, I expect more
will come in case bugs are found in this area.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/lib/test-runcmd.c

Modified: nagioscore/trunk/lib/test-runcmd.c
===================================================================
--- nagioscore/trunk/lib/test-runcmd.c	2013-02-27 14:49:53 UTC (rev 2642)
+++ nagioscore/trunk/lib/test-runcmd.c	2013-02-27 14:50:10 UTC (rev 2643)
@@ -61,6 +61,17 @@
 	{ 0, NULL},
 };
 
+struct {
+	int ret;
+	char *cmd;
+	int argc_exp;
+	char *argv_exp[10];
+} parse_case[] = {
+	{ 0, "foo bar nisse", 3, { "foo", "bar", "nisse", NULL }},
+	{ 0, "foo\\ bar nisse", 2, { "foo bar", "nisse", NULL }},
+	{ 0, NULL, 0, NULL },
+};
+
 int main(int argc, char **argv)
 {
 	int ret, r2;
@@ -98,5 +109,24 @@
 		}
 	}
 	r2 = t_end();
+	ret = r2 ? r2 : ret;
+	t_reset();
+	t_start("argument splitting");
+	{
+		int i;
+		for (i = 0; parse_case[i].cmd; i++) {
+			int x, out_argc;
+			char *out_argv[256];
+			int ret = runcmd_cmd2strv(parse_case[i].cmd, &out_argc, out_argv);
+			out_argv[out_argc] = NULL;
+			ok_int(ret, 0, parse_case[i].cmd);
+			ok_int(out_argc, parse_case[i].argc_exp, parse_case[i].cmd);
+			for (x = 0; x < parse_case[x].argc_exp && out_argv[x]; x++) {
+				ok_str(parse_case[i].argv_exp[x], out_argv[x], "argv comparison test");
+			}
+		}
+	}
+
+	r2 = t_end();
 	return r2 ? r2 : ret;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nagios-checkins] SF.net SVN: nagios:[2647] nagioscore/trunk/lib/test-runcmd.c

From: <ageric@us...> - 2013-03-01 15:31

Revision: 2647
          http://nagios.svn.sourceforge.net/nagios/?rev=2647&view=rev
Author:   ageric
Date:     2013-03-01 15:31:37 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
lib/test-runcmd: Add anomaly detection for semi-colons

They're "job control" issues and must be properly detected
as such. This is done properly, but the issue was raised since
someone failed at shell-scripting, so we may as well have the
test in place.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/lib/test-runcmd.c

Modified: nagioscore/trunk/lib/test-runcmd.c
===================================================================
--- nagioscore/trunk/lib/test-runcmd.c	2013-03-01 15:31:17 UTC (rev 2646)
+++ nagioscore/trunk/lib/test-runcmd.c	2013-03-01 15:31:37 UTC (rev 2647)
@@ -40,6 +40,8 @@
 	{ 0, "foo \\&\\& bar" },
 	{ CMD_HAS_JOBCONTROL, "foo & bar" },
 	{ 0, "foo \\& bar" },
+	{ CMD_HAS_JOBCONTROL, "lala foo ; bar" },
+	{ 0, "lala 'foo; bar'" },
 	{ CMD_HAS_SUBCOMMAND, "foo \"`extcmd`\"" },
 	{ 0, "foo \"\\`extcmd\\`\"" },
 	{ CMD_HAS_SUBCOMMAND, "foo `extcmd`" },

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nagios-checkins] SF.net SVN: nagios:[2703] nagioscore/trunk/lib/test-runcmd.c

From: <ageric@us...> - 2013-03-25 12:32

Revision: 2703
          http://nagios.svn.sourceforge.net/nagios/?rev=2703&view=rev
Author:   ageric
Date:     2013-03-25 12:32:27 +0000 (Mon, 25 Mar 2013)
Log Message:
-----------
lib/test-runcmd: Make it build with new runcmd flags

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/lib/test-runcmd.c

Modified: nagioscore/trunk/lib/test-runcmd.c
===================================================================
--- nagioscore/trunk/lib/test-runcmd.c	2013-03-25 12:32:09 UTC (rev 2702)
+++ nagioscore/trunk/lib/test-runcmd.c	2013-03-25 12:32:27 UTC (rev 2703)
@@ -34,31 +34,31 @@
 	int ret;
 	char *cmd;
 } anomaly[] = {
-	{ CMD_HAS_REDIR, "cat lala | grep foo" },
+	{ RUNCMD_HAS_REDIR, "cat lala | grep foo" },
 	{ 0, "cat lala \\| grep foo" },
-	{ CMD_HAS_JOBCONTROL, "foo && bar" },
+	{ RUNCMD_HAS_JOBCONTROL, "foo && bar" },
 	{ 0, "foo \\&\\& bar" },
-	{ CMD_HAS_JOBCONTROL, "foo & bar" },
+	{ RUNCMD_HAS_JOBCONTROL, "foo & bar" },
 	{ 0, "foo \\& bar" },
-	{ CMD_HAS_JOBCONTROL, "lala foo ; bar" },
+	{ RUNCMD_HAS_JOBCONTROL, "lala foo ; bar" },
 	{ 0, "lala 'foo; bar'" },
-	{ CMD_HAS_SUBCOMMAND, "foo \"`extcmd`\"" },
+	{ RUNCMD_HAS_SUBCOMMAND, "foo \"`extcmd`\"" },
 	{ 0, "foo \"\\`extcmd\\`\"" },
-	{ CMD_HAS_SUBCOMMAND, "foo `extcmd`" },
+	{ RUNCMD_HAS_SUBCOMMAND, "foo `extcmd`" },
 	{ 0, "foo \\`extcmd\\`" },
-	{ CMD_HAS_SUBCOMMAND, "foo \"$(extcmd)\"" },
+	{ RUNCMD_HAS_SUBCOMMAND, "foo \"$(extcmd)\"" },
 	{ 0, "foo \\$\\(extcmd\\)" },
-	{ CMD_HAS_SUBCOMMAND | CMD_HAS_PAREN, "foo $(extcmd" },
+	{ RUNCMD_HAS_SUBCOMMAND | RUNCMD_HAS_PAREN, "foo $(extcmd" },
 	{ 0, "foo \\$\\(extcmd\\)" },
-	{ CMD_HAS_UBDQ, "foo\" bar" },
+	{ RUNCMD_HAS_UBDQ, "foo\" bar" },
 	{ 0, "foo\\\" bar" },
-	{ CMD_HAS_UBSQ, "foo' bar" },
+	{ RUNCMD_HAS_UBSQ, "foo' bar" },
 	{ 0, "foo\\' bar" },
-	{ CMD_HAS_WILDCARD, "ls -l /tmp/*" },
+	{ RUNCMD_HAS_WILDCARD, "ls -l /tmp/*" },
 	{ 0, "ls -l /tmp/\\*" },
-	{ CMD_HAS_WILDCARD, "ls -l /dev/tty?" },
+	{ RUNCMD_HAS_WILDCARD, "ls -l /dev/tty?" },
 	{ 0, "ls -l /dev/tty\\?" },
-	{ CMD_HAS_SHVAR, "echo $foo" },
+	{ RUNCMD_HAS_SHVAR, "echo $foo" },
 	{ 0, "echo \\$foo" },
 	{ 0, NULL},
 };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nagios-checkins] SF.net SVN: nagios:[2724] nagioscore/trunk/lib/test-runcmd.c

From: <ageric@us...> - 2013-04-07 15:39

Revision: 2724
          http://nagios.svn.sourceforge.net/nagios/?rev=2724&view=rev
Author:   ageric
Date:     2013-04-07 15:38:50 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
lib/test-runcmd: Add missing initializers

Since we improved on the testsuite somewhat, the sentinel in the
test-data struct was a tad malformed. This patch corrects it.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/lib/test-runcmd.c

Modified: nagioscore/trunk/lib/test-runcmd.c
===================================================================
--- nagioscore/trunk/lib/test-runcmd.c	2013-04-07 15:38:31 UTC (rev 2723)
+++ nagioscore/trunk/lib/test-runcmd.c	2013-04-07 15:38:50 UTC (rev 2724)
@@ -71,7 +71,7 @@
 } parse_case[] = {
 	{ 0, "foo bar nisse", 3, { "foo", "bar", "nisse", NULL }},
 	{ 0, "foo\\ bar nisse", 2, { "foo bar", "nisse", NULL }},
-	{ 0, NULL, 0, NULL },
+	{ 0, NULL, 0, { NULL, NULL, NULL }},
 };
 
 int main(int argc, char **argv)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nagios-checkins] SF.net SVN: nagios:[2747] nagioscore/trunk/lib/test-runcmd.c

From: <ageric@us...> - 2013-04-16 12:46

Revision: 2747
          http://nagios.svn.sourceforge.net/nagios/?rev=2747&view=rev
Author:   ageric
Date:     2013-04-16 12:46:46 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
lib/test-runcmd: Enumerate the anomaly testcases

It's silly not to, since searching for the right C representation
of a shell-escaped string is just retardedly annoying.

Signed-off-by: Andreas Ericsson <ae@...>

Modified Paths:
--------------
    nagioscore/trunk/lib/test-runcmd.c

Modified: nagioscore/trunk/lib/test-runcmd.c
===================================================================
--- nagioscore/trunk/lib/test-runcmd.c	2013-04-12 16:44:03 UTC (rev 2746)
+++ nagioscore/trunk/lib/test-runcmd.c	2013-04-16 12:46:46 UTC (rev 2747)
@@ -43,14 +43,14 @@
 	{ 0, "foo \\& bar" },
 	{ RUNCMD_HAS_JOBCONTROL, "lala foo ; bar" },
 	{ 0, "lala 'foo; bar'" },
-	{ RUNCMD_HAS_SUBCOMMAND, "foo \"`extcmd`\"" },
-	{ 0, "foo \"\\`extcmd\\`\"" },
-	{ RUNCMD_HAS_SUBCOMMAND, "foo `extcmd`" },
-	{ 0, "foo \\`extcmd\\`" },
-	{ RUNCMD_HAS_SUBCOMMAND, "foo \"$(extcmd)\"" },
-	{ 0, "foo \\$\\(extcmd\\)" },
-	{ RUNCMD_HAS_SUBCOMMAND | RUNCMD_HAS_PAREN, "foo $(extcmd" },
-	{ 0, "foo \\$\\(extcmd\\)" },
+	{ RUNCMD_HAS_SUBCOMMAND, "foo \"`extcmd1`\"" },
+	{ 0, "foo \"\\`extcmd1\\`\"" },
+	{ RUNCMD_HAS_SUBCOMMAND, "foo `extcmd2`" },
+	{ 0, "foo \\`extcmd2\\`" },
+	{ RUNCMD_HAS_SUBCOMMAND, "foo \"$(extcmd3)\"" },
+	{ 0, "foo \\$\\(extcmd3\\)" },
+	{ RUNCMD_HAS_SUBCOMMAND | RUNCMD_HAS_PAREN, "foo $(extcmd4" },
+	{ 0, "foo \\$\\(extcmd4\\)" },
 	{ RUNCMD_HAS_UBDQ, "foo\" bar" },
 	{ 0, "foo\\\" bar" },
 	{ RUNCMD_HAS_UBSQ, "foo' bar" },

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.