use new test file naming convention

.gitignore

@@ -42,10 +42,10 @@ eg/negation
 eg/alga
 
 # test binaries
-tests/test-mutate
-tests/test-showmutable
-tests/test-derive
-tests/test-utils
+test/mutate
+test/showmutable
+test/derive
+test/utils
 
 # Haddock
 doc/**/*.html

Makefile

@@ -41,10 +41,10 @@ EGS = \
 EXTRA_EGS = $(EGS) \
   eg/alga
 TESTS = \
-  tests/test-derive      \
-  tests/test-mutate      \
-  tests/test-showmutable \
-  tests/test-utils
+  test/derive      \
+  test/mutate      \
+  test/showmutable \
+  test/utils
 HADDOCKFLAGS = $(shell grep -q "Arch Linux" /etc/lsb-release && echo --optghc=-dynamic)
 LIB_DEPS = base template-haskell leancheck cmdargs
 
@@ -57,16 +57,16 @@ egs: $(EGS) all
 ghci: Test/FitSpec.ghci
 
 test: all benchs egs $(TESTS)
-	./tests/test-mutate
-	./tests/test-showmutable
-	./tests/test-derive
-	./tests/test-utils
+	./test/mutate
+	./test/showmutable
+	./test/derive
+	./test/utils
 
 test-with-extra-deps: all $(EXTRA_BENCHS) $(EXTRA_EGS) $(TESTS)
-	./tests/test-mutate
-	./tests/test-showmutable
-	./tests/test-derive
-	./tests/test-utils
+	./test/mutate
+	./test/showmutable
+	./test/derive
+	./test/utils
 
 legacy-test:
 	make clean && make test -j8 GHC=ghc-8.2  GHCFLAGS="-Werror -dynamic"
@@ -79,7 +79,7 @@ test-via-cabal:
 	cabal configure --enable-tests --enable-benchmarks --ghc-options="-dynamic -Werror" $(CABALOPTS) && cabal build && cabal test
 
 test-sdist:
-	tests/test-sdist
+	./test/sdist
 
 prepare-test-via-cabal:
 	rm -rf .cabal-sandbox cabal.sandbox.config
@@ -131,3 +131,8 @@ bench/heaps: bench/Heap.o
 bench/digraphs: bench/Digraph.o
 
 include mk/haskell.mk
+# NOTE:
+#
+# To run make depend, you may need to pass -package now to expose a package:
+#
+# make depend GHCFLAGS="-package haskell-src-exts"

bench/haskell-src-exts.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 import Test.FitSpec
 import Language.Haskell.Exts
-import Language.Haskell.Exts.Pretty
 
 instance Eq a => Eq (ParseResult a) where
   ParseOk x == ParseOk y = x == y

mk/depend.mk

@@ -322,11 +322,6 @@ eg/sorting.o: \
   src/Test/FitSpec/Engine.hs \
   src/Test/FitSpec/Derive.hs \
   eg/sorting.hs
-Setup.o: \
-  Setup.hs
-Setup: \
-  Setup.hs \
-  mk/toplibs
 src/Test/FitSpec/Derive.o: \
   src/Test/FitSpec/ShowMutable.hs \
   src/Test/FitSpec/PrettyPrint.hs \
@@ -407,8 +402,8 @@ src/Test/FitSpec/TestTypes.o: \
   src/Test/FitSpec/Mutable.hs
 src/Test/FitSpec/Utils.o: \
   src/Test/FitSpec/Utils.hs
-tests/test-derive.o: \
-  tests/test-derive.hs \
+test/derive.o: \
+  test/derive.hs \
   src/Test/FitSpec/Utils.hs \
   src/Test/FitSpec/TestTypes.hs \
   src/Test/FitSpec/ShowMutable/Tuples.hs \
@@ -421,11 +416,11 @@ tests/test-derive.o: \
   src/Test/FitSpec/Main.hs \
   src/Test/FitSpec/Engine.hs \
   src/Test/FitSpec/Derive.hs
-tests/test-derive: \
-  tests/test-derive.hs \
+test/derive: \
+  test/derive.hs \
   mk/toplibs
-tests/test-mutate.o: \
-  tests/test-mutate.hs \
+test/mutate.o: \
+  test/mutate.hs \
   src/Test/FitSpec/Utils.hs \
   src/Test/FitSpec/TestTypes.hs \
   src/Test/FitSpec/ShowMutable/Tuples.hs \
@@ -438,11 +433,11 @@ tests/test-mutate.o: \
   src/Test/FitSpec/Main.hs \
   src/Test/FitSpec/Engine.hs \
   src/Test/FitSpec/Derive.hs
-tests/test-mutate: \
-  tests/test-mutate.hs \
+test/mutate: \
+  test/mutate.hs \
   mk/toplibs
-tests/test-showmutable.o: \
-  tests/test-showmutable.hs \
+test/showmutable.o: \
+  test/showmutable.hs \
   src/Test/FitSpec/Utils.hs \
   src/Test/FitSpec/TestTypes.hs \
   src/Test/FitSpec/ShowMutable/Tuples.hs \
@@ -455,12 +450,12 @@ tests/test-showmutable.o: \
   src/Test/FitSpec/Main.hs \
   src/Test/FitSpec/Engine.hs \
   src/Test/FitSpec/Derive.hs
-tests/test-showmutable: \
-  tests/test-showmutable.hs \
+test/showmutable: \
+  test/showmutable.hs \
   mk/toplibs
-tests/test-utils.o: \
-  tests/test-utils.hs \
+test/utils.o: \
+  test/utils.hs \
   src/Test/FitSpec/Utils.hs
-tests/test-utils: \
-  tests/test-utils.hs \
+test/utils: \
+  test/utils.hs \
   mk/toplibs