From 0018a89106977814194a442e6219ef400ebfb35d Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 8 Dec 2008 15:48:47 +1030
Subject: [PATCH] Fix make check to run all tests. Fix str test.

---
 Makefile            | 6 ++++++
 ccan/str/test/run.c | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4e497974..222a9b22 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2)
 include Makefile-ccan
 
 check: $(ALL_DIRS:%=test-%)
+	echo $(ALL_DIRS)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
@@ -82,6 +83,11 @@ test-ccan/%: tools/run_tests libccan.a(%.o)
 	@echo Testing $*...
 	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
 
+# Some don't have object files.
+test-ccan/%:: tools/run_tests
+	@echo Testing $*...
+	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+
 ccanlint: tools/ccanlint/ccanlint
 
 clean: tools-clean
diff --git a/ccan/str/test/run.c b/ccan/str/test/run.c
index 20711ad0..b55444a1 100644
--- a/ccan/str/test/run.c
+++ b/ccan/str/test/run.c
@@ -1,7 +1,6 @@
-#include "string/string.h"
+#include "str/str.h"
 #include <stdlib.h>
 #include <stdio.h>
-#include "string/string.c"
 #include "tap/tap.h"
 
 /* FIXME: ccanize */
@@ -24,8 +23,6 @@ static char *strdup_rev(const char *s)
 int main(int argc, char *argv[])
 {
 	unsigned int i, j, n;
-	char **split, *str;
-	void *ctx;
 	char *strings[NUM_SUBSTRINGS * NUM_SUBSTRINGS];
 	
 	n = 0;
-- 
2.39.2