backported some of the v5 testbench

this permits us to keep a persistent test environment between
v4 and v5, most importantly using the same tools. As far as the
actual tests are concerned, some had issues. I had no time to check
if that was an issue with the test or an actual issue with the
v3/4 engine. Will do that at some later stage.

1 files changed, 51 insertions, 15 deletions

diff --git a/tests/chkseq.c b/tests/chkseq.c
index 3203c250..8c5fc61a 100644
--- a/tests/chkseq.c
+++ b/tests/chkseq.c
@@ -3,9 +3,10 @@
  * be set.
  *
  * Params
- * argv[1]	file to check
- * argv[2]	start number
- * argv[3]	end number
+ * -f<filename> MUST be given!
+ * -s<starting number> -e<ending number>
+ * default for s is 0. -e should be given (else it is also 0)
+ * -d may be specified, in which case duplicate messages are permitted.
  *
  * Part of the testbench for rsyslog.
  *
@@ -31,6 +32,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <getopt.h>
 
 int main(int argc, char *argv[])
 {
@@ -38,16 +40,36 @@ int main(int argc, char *argv[])
 	int val;
 	int i;
 	int ret = 0;
-	int start, end;
+	int dupsPermitted = 0;
+	int start = 0, end = 0;
+	int opt;
+	int nDups = 0;
+	char *file = NULL;
 
-	if(argc != 4) {
-		printf("Invalid call of chkseq\n");
-		printf("Usage: chkseq file start end\n");
+	while((opt = getopt(argc, argv, "e:f:ds:")) != EOF) {
+		switch((char)opt) {
+		case 'f':
+			file = optarg;
+			break;
+                case 'd':
+			dupsPermitted = 1;
+			break;
+                case 'e':
+			end = atoi(optarg);
+			break;
+                case 's':
+			start = atoi(optarg);
+			break;
+		default:printf("Invalid call of chkseq\n");
+			printf("Usage: chkseq file -sstart -eend -d\n");
+			exit(1);
+		}
+	}
+
+	if(file == NULL) {
+		printf("file must be given!\n");
 		exit(1);
 	}
-	
-	start = atoi(argv[2]);
-	end = atoi(argv[3]);
 
 	if(start > end) {
 		printf("start must be less than or equal end!\n");
@@ -55,22 +77,36 @@ int main(int argc, char *argv[])
 	}
 
 	/* read file */
-	fp = fopen(argv[1], "r");
+	fp = fopen(file, "r");
 	if(fp == NULL) {
-		perror(argv[1]);
+		printf("error opening file '%s'\n", file);
+		perror(file);
 		exit(1);
 	}
 
-	for(i = start ; i < end ; ++i) {
+	for(i = start ; i < end+1 ; ++i) {
 		if(fscanf(fp, "%d\n", &val) != 1) {
 			printf("scanf error in index i=%d\n", i);
 			exit(1);
 		}
 		if(val != i) {
-			printf("read value %d, but expected value %d\n", val, i);
-			exit(1);
+			if(val == i - 1 && dupsPermitted) {
+				--i;
+				++nDups;
+			} else {
+				printf("read value %d, but expected value %d\n", val, i);
+				exit(1);
+			}
 		}
 	}
 
+	if(nDups != 0)
+		printf("info: had %d duplicates (this is no error)\n", nDups);
+
+	if(i - 1 != end) {
+		printf("only %d records in file, expected %d\n", i - 1, end);
+		exit(1);
+	}
+
 	exit(ret);
 }