From bb67fb749dca4e287a5e6fd490114d11d6a044d1 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Sun, 23 Aug 2015 02:33:31 +0200
Subject: [PATCH] rsync.c: Refactor unit tests to work on Travis as well.

Travis does not have `/bin/tree` installed, and since we do not
output intermediate results from `make test`, there is no need
to call `/bin/tree` unless `-v` is supplied to the test.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 rsync.c | 60 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/rsync.c b/rsync.c
index 23b7ed1..51815b3 100644
--- a/rsync.c
+++ b/rsync.c
@@ -198,7 +198,8 @@ static int prune(char *dst, char **new_files, int new_num)
 #define SRC  BASE "src/"
 #define DST  BASE "dst/"
 
-char *files[] = {
+static int verbose = 0;
+static char *files[] = {
 	SRC "sub1/1.tst",
 	SRC "sub1/2.tst",
 	SRC "sub1/3.tst",
@@ -240,51 +241,64 @@ void setup_test(void)
 	}
 }
 
-int run_test()
+static void tree(char *heading, char *dir)
 {
+	if (verbose) {
+		char cmd[128];
+
+		if (heading)
+			puts(heading);
+
+		snprintf(cmd, sizeof(cmd), "tree -np %s", dir);
+		if (system(cmd))
+			perror("Failed calling tree, not installed perhaps");
+	}
+}
+
+int run_test(void)
+{
+	int result = 0;
+
 #if 0
 	setup_test();
-	puts("Before:");
-	system("tree -np " BASE);
+	tree("Before:", BASE);
 
-	rsync(SRC, DST, 0, NULL);
-	puts("After:");
-	system("tree -np " BASE);
+	result += rsync(SRC, DST, 0, NULL);
+	tree("After:", BASE);
 	cleanup_test();
 #endif
 
 	setup_test();
-	rsync(BASE "src", DST, 0, NULL);
-	puts("Only partial rsync of src <-- No slash!");
-	system("tree -np " BASE);
+	result += rsync(BASE "src", DST, 0, NULL);
+	tree("Only partial rsync of src <-- No slash!", BASE);
 #if 0
 	cleanup_test();
 	setup_test();
-	rsync(BASE "src/sub1", BASE "dst", 0, NULL);
-	puts("Only partial rsync of src/sub1 <-- No slashes!!");
-	system("tree -np " BASE);
+	result += rsync(BASE "src/sub1", BASE "dst", 0, NULL);
+	tree("Only partial rsync of src/sub1 <-- No slashes!!", BASE);
 
 	cleanup_test();
 	setup_test();
-	rsync(BASE "src/sub1/", DST, 0, NULL);
-	puts("Only partial rsync of src/sub1/");
-	system("tree -np " BASE);
+	result += rsync(BASE "src/sub1/", DST, 0, NULL);
+	tree("Only partial rsync of src/sub1/", BASE);
 
 	cleanup_test();
 	setup_test();
-	rsync(BASE "src/sub1", DST, 0, NULL);
-	puts("Only partial rsync of src/sub1 <-- No slash!");
-	system("tree -np " BASE);
+	result += rsync(BASE "src/sub1", DST, 0, NULL);
+	tree("Only partial rsync of src/sub1 <-- No slash!", BASE);
 
-	rsync("/etc", "/var/tmp", 0, NULL);
-	puts("Real life test:");
-	system("tree -np /var/tmp");
+	result += rsync("/etc", "/var/tmp", 0, NULL);
+	tree("Real life test:", "/var/tmp");
 #endif
-	return 0;
+
+	return result;
 }
 
 int main(int argc, char *argv[])
 {
+	if (argc > 1)
+		verbose = !strncmp("-v", argv[1], 2);
+
 	atexit(cleanup_test);
 
 	return run_test();