Merge branch 'v4-stable' into v5-stable

Conflicts:
	tests/Makefile.am
	tests/diag.sh
	tests/tcpflood.c

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/inputfilegen.c b/tests/inputfilegen.c
new file mode 100644
index 00000000..26fb79af
--- /dev/null
+++ b/tests/inputfilegen.c
@@ -0,0 +1,23 @@
+/* generate an input file suitable for use by the testbench
+ * Copyright (C) 2011 by Rainer Gerhards and Adiscon GmbH.
+ * Part of rsyslog, licensed under GPLv3
+ */
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char* argv[])
+{
+	int nmsgs;
+	int i;
+
+	if(argc != 2) {
+		fprintf(stderr, "usage: inputfilegen num-messages\n");
+		return 1;
+	}
+
+	nmsgs = atoi(argv[1]);
+	for(i = 0 ; i < nmsgs ; ++i) {
+		printf("msgnum:%8.8d:\n", i);
+	}
+	return 0;
+}