From 43d52c77baa48263543d685d0de8504005cd83ca Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 8 Nov 2012 18:28:16 +0100
Subject: [PATCH] test: make `make test` link against .so

---
 .gitignore     |  4 ++--
 Makefile       | 13 +++++--------
 config-unix.mk |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa9636d1..0d90eac0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 *.swp
-*.o
+*.[oa]
+*.so
 *.lo
 *.la
-*.a
 *.opensdf
 *.orig
 *.sdf
diff --git a/Makefile b/Makefile
index 59875475..b0716f99 100644
--- a/Makefile
+++ b/Makefile
@@ -37,23 +37,20 @@ BENCHMARKS=test/blackhole-server.c test/echo-server.c test/dns-server.c test/ben
 
 all: libuv.a
 
-test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) libuv.a
-	$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-tests test/run-tests.c \
-		test/runner.c $(RUNNER_SRC) $(TESTS) libuv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
+test/run-tests$(E): test/run-tests.c test/runner.c $(RUNNER_SRC) $(TESTS) libuv.so
+	$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o $@ $^ $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
 
-test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.a
-	$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-benchmarks test/run-benchmarks.c \
-		 test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
+test/run-benchmarks$(E): test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.so
+	$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o $@ $^ $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
 
 test/echo.o: test/echo.c test/echo.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c test/echo.c -o test/echo.o
 
 
 .PHONY: clean clean-platform distclean distclean-platform test bench
 
 
 test: test/run-tests$(E)
-	test/run-tests
+	LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." test/run-tests
 
 #test-%:	test/run-tests$(E)
 #	test/run-tests $(@:test-%=%)
diff --git a/config-unix.mk b/config-unix.mk
index dc7b766b..39d7923e 100644
--- a/config-unix.mk
+++ b/config-unix.mk
@@ -120,8 +120,8 @@ OBJS += src/unix/cygwin.o
 endif
 
 # Need _GNU_SOURCE for strdup?
-RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE
-RUNNER_LINKFLAGS=$(LINKFLAGS)
+RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE -Itest
+RUNNER_LINKFLAGS=$(LINKFLAGS) -L"$(PWD)" -luv
 
 ifeq (SunOS,$(uname_S))
 RUNNER_LINKFLAGS += -pthreads