1 files changed, 69 insertions, 7 deletions

diff --git a/src/tests/globset/test-globset.c b/src/tests/globset/test-globset.c
index 86e778e0..630fb897 100644
--- a/src/tests/globset/test-globset.c
+++ b/src/tests/globset/test-globset.c
@@ -23,38 +23,100 @@
 
 #include "globset.h"
 
-int main()
+void process(FILE *in, FILE *out)
 {
 	int rc;
 	char buffer[1024], *str;
 	const struct globset_handler *gh;
 	struct globset *set;
 
-	setvbuf(stdout, NULL, _IOLBF, 0);
 	set = globset_create();
-	while (fgets(buffer, sizeof buffer, stdin)) {
+	while (fgets(buffer, sizeof buffer, in)) {
 		str = strchr(buffer,'\n');
 		if (str) *str = 0;
 		errno = 0;
 		switch (buffer[0]) {
 		case '+':
 			rc = globset_add(set, &buffer[1], NULL, NULL);
-			printf("add [%s]: %d, %m\n", &buffer[1], rc);
+			fprintf(out, "add [%s]: %d, %m\n", &buffer[1], rc);
 			break;
 		case '-':
 			rc = globset_del(set, &buffer[1], NULL);
-			printf("del [%s]: %d, %m\n", &buffer[1], rc);
+			fprintf(out, "del [%s]: %d, %m\n", &buffer[1], rc);
 			break;
 		case '?':
 			gh = globset_search(set, &buffer[1]);
-			printf("search [%s]: %s%s\n", &buffer[1], gh ? "found " : "NOT FOUND", gh ? gh->pattern : "");
+			fprintf(out, "search [%s]: %s%s\n", &buffer[1], gh ? "found " : "NOT FOUND", gh ? gh->pattern : "");
 			break;
 		default:
 			gh = globset_match(set, buffer);
-			printf("match [%s]: %s%s\n", buffer, gh ? "found by " : "NOT FOUND", gh ? gh->pattern : "");
+			fprintf(out, "match [%s]: %s%s\n", buffer, gh ? "found by " : "NOT FOUND", gh ? gh->pattern : "");
 			break;
 		}
 	}
 	globset_destroy(set);
+}
+
+int compare(FILE *f1, FILE *f2)
+{
+	int l = 0, n = 0;
+	char b1[1024], b2[1024];
+	char *s1, *s2;
+
+	for(;;) {
+		l++;
+		s1 = fgets(b1, sizeof b1, f1);
+		s2 = fgets(b2, sizeof b2, f2);
+		if (s1 == NULL || s2 == NULL) {
+			if (s1 != s2) {
+				fprintf(stderr, "Length of outputs differ\n");
+				n++;
+			}
+			return n;
+		}
+		if (strcmp(s1, s2)) {
+			fprintf(stderr, "Line %d differ\n\t%s\t%s", l, s1, s2);
+			n++;
+		}
+	}
+}
+
+int main(int ac, char **av)
+{
+	FILE *in = stdin;
+	FILE *out = stdout;
+	FILE *ref = NULL;
+
+	if (ac >= 2) {
+		in = fopen(av[1], "r");
+		if (in == NULL) {
+			fprintf(stderr, "Can't open file %s: %m\n", av[1]);
+			return 1;
+		}
+	}
+
+	if (ac < 3)
+		setvbuf(stdout, NULL, _IOLBF, 0);
+	else {
+		ref = fopen(av[2], "r");
+		if (ref == NULL) {
+			fprintf(stderr, "Can't open file %s: %m\n", av[2]);
+			return 1;
+		}
+		out = tmpfile();
+		if (out == NULL) {
+			fprintf(stderr, "Can't create temporary file: %m\n");
+			return 1;
+		}
+	}
+
+	process(in, out);
+
+	if (ref) {
+		rewind(out);
+		if (compare(out, ref))
+			return 1;
+	}
+
 	return 0;
 }