From 36653ebe5a9f5af1c06203efc6b74164f3b3cccf Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Mon, 17 Feb 2020 15:48:46 +0100
Subject: [PATCH] Honor rc in unit runs and fix execution path in make run

---
 test/unit/Makefile          | 2 +-
 test/unit/test_contrbtree.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unit/Makefile b/test/unit/Makefile
index b833a8b788..b7bab79aaf 100644
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -10,7 +10,7 @@ $(BINDIR)/%: %.c
 	$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)
 
 run:
-	r=0 ; for a in $(BINS) ; do ./$$a || r=1; done ; exit $r
+	r=0 ; cd .. ; for a in $(BINS) ; do ./unit/$$a || r=1; done ; echo unit$$r ; exit $$r
 
 clean:
 	rm -f $(BINS)
diff --git a/test/unit/test_contrbtree.c b/test/unit/test_contrbtree.c
index 1afc4e5631..523546e8df 100644
--- a/test/unit/test_contrbtree.c
+++ b/test/unit/test_contrbtree.c
@@ -42,7 +42,7 @@ static int strbuf_num_cmp1(void *incoming, void *in, void *user) {
 }
 
 bool test_r_rbtree_cont_delete() {
-	RContRBTree *tree = r_rbtree_cont_newf(r_strbuf_free);
+	RContRBTree *tree = r_rbtree_cont_newf ((RContRBFree)r_strbuf_free);
 	r_rbtree_cont_insert(tree, r_strbuf_new("13"), strbuf_num_cmp0, NULL);
 	r_rbtree_cont_insert(tree, r_strbuf_new("0x9090"), strbuf_num_cmp0, NULL);
 	r_rbtree_cont_insert(tree, r_strbuf_new("42"), strbuf_num_cmp0, NULL);