From 909e781852e3566fcaa16e156437ebe5bfc89e02 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 21 Apr 2013 12:41:57 -0400 Subject: [PATCH] Use Cabal test integration. --- hath.cabal | 39 +++++++++++++++++++++++++++++++++++++++ makefile | 14 +++++++++++--- test/TestSuite.hs | 9 --------- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/hath.cabal b/hath.cabal index ee3615a..23f6cc4 100644 --- a/hath.cabal +++ b/hath.cabal @@ -47,3 +47,42 @@ executable hath -prof -auto-all -caf-all + + +test-suite testsuite + type: exitcode-stdio-1.0 + hs-source-dirs: src test + main-is: TestSuite.hs + build-depends: + base == 4.*, + HUnit == 1.2.*, + QuickCheck == 2.6.*, + test-framework == 0.8.*, + test-framework-hunit == 0.3.*, + test-framework-quickcheck2 == 0.3.* + + -- It's not entirely clear to me why I have to reproduce all of this. + ghc-options: + -Wall + -fwarn-hi-shadowing + -fwarn-missing-signatures + -fwarn-name-shadowing + -fwarn-orphans + -fwarn-type-defaults + -fwarn-tabs + -fwarn-incomplete-record-updates + -fwarn-monomorphism-restriction + -fwarn-unused-do-bind + -funbox-strict-fields + -fexcess-precision + -fno-spec-constr-count + -rtsopts + -threaded + -optc-O3 + -optc-march=native + -O2 + +source-repository head + type: git + location: http://michael.orlitzky.com/git/hath.git + branch: master diff --git a/makefile b/makefile index 50dda0f..2d46895 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,9 @@ +BIN = dist/build/hath/hath +TESTSUITE_BIN = dist/build/testsuite/testsuite + .PHONY : test -hath: src/*.hs +$(BIN): src/*.hs runghc Setup.hs clean runghc Setup.hs configure --user runghc Setup.hs build @@ -13,8 +16,13 @@ profile: src/*.hs clean: runghc Setup.hs clean -test: - runghc -i"src" test/TestSuite.hs + +$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs + runghc Setup.hs configure --user --flags=${FLAGS} --enable-tests + runghc Setup.hs build + +test: $(BIN) $(TESTSUITE_BIN) + runghc Setup.hs test dist: runghc Setup.hs configure diff --git a/test/TestSuite.hs b/test/TestSuite.hs index 3085c1b..406fec5 100644 --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -1,20 +1,11 @@ {-# LANGUAGE NoMonomorphismRestriction #-} import Data.Monoid (mempty) import Test.Framework ( - RunnerOptions(), Test, - TestName, - TestOptions(), defaultMainWithOpts, - testGroup ) import Test.Framework.Options import Test.Framework.Runners.Options -import Test.Framework.Providers.API (TestName) -import Test.Framework.Providers.HUnit (testCase) -import Test.Framework.Providers.QuickCheck2 (testProperty) -import Test.HUnit -import Test.QuickCheck (Testable ()) import Cidr (cidr_properties, cidr_tests) -- 2.44.2