From 317e8c9bf6097df93c28e7d335cea0a2006c23f0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 27 Feb 2013 15:13:25 -0400
Subject: make test use cabal

---
 Makefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c914ece6e..62c198d09 100644
--- a/Makefile
+++ b/Makefile
@@ -47,14 +47,13 @@ install: build-stamp install-docs
 	ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell
 	runghc Build/InstallDesktopFile.hs $(PREFIX)/bin/git-annex || true
 
-test: $(sources) $(clibs)
-	@if ! $(GHCMAKE) -O0 test $(clibs); then \
-		echo "** failed to build the test suite" >&2; \
-		exit 1; \
-	elif ! ./test; then \
-		echo "** test suite failed!" >&2; \
-		exit 1; \
-	fi
+test:
+# workaround for, apparently, a cabal bug
+	hsc2hs Utility/Touch.hsc
+	cabal configure --enable-tests
+	cabal build
+	rm -f Utility/Touch.hs
+	cabal test
 
 testcoverage:
 	rm -f test.tix test
-- 
cgit v1.2.3