Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/MarcWeber/hasktags

Conflicts:
	testcases/expected_failures_testing_suite.hs
	tests/Test.hs
  • Loading branch information...
commit 8a4a92250bac802c3975053e0cfdfcc2eff1cc2b 2 parents d8eb1ac + 49e6546
Marco Túlio Gontijo authored
8 hasktags.cabal
View
@@ -52,8 +52,8 @@ Executable hasktags
base >= 4 && < 5,
bytestring >= 0.9 && < 0.10,
directory >= 1.1 && < 1.2,
- filepath >= 1.3 && < 1.4,
- json >= 0.5 && < 0.6
+ filepath,
+ json >= 0.5 && <= 0.6
other-modules: Tags, Hasktags
hs-source-dirs: src
ghc-options: -Wall
@@ -67,8 +67,8 @@ Test-Suite test
base >= 4 && < 5,
bytestring >= 0.9 && < 0.10,
directory >= 1.1 && < 1.2,
- filepath >= 1.3 && < 1.4,
- json >= 0.5 && < 0.6,
+ filepath,
+ json >= 0.5 && <= 0.6,
HUnit >= 1.2 && < 1.3
ghc-options: -Wall
default-language: Haskell2010
12 testcases/expected_failures_testing_suite.hs
View
@@ -0,0 +1,12 @@
+-- this file only exists to test all cases once .. all should fail
+module C
+
+-- to be found A
+--
+-- not to be found C
+
+-- once to be found B
+--
+-- C should be found twice ... (?)
+-- once to be found C
+data C = C
2  tests/Test.hs
View
@@ -96,6 +96,6 @@ main
= do
setCurrentDirectory "testcases"
files <- getDirectoryContents "."
- tests <- mapM createTestCase $ filter (not . (`elem` [".", ".."])) files
+ tests <- mapM createTestCase $ filter (not . (`elem` [".", "..", "expected_failures_testing_suite.hs"])) files
counts_ <- runTestTT $ TestList tests
when (errors counts_ + failures counts_ > 0) exitFailure
Please sign in to comment.
Something went wrong with that request. Please try again.