Merge branch 'tests'

1 files changed, 3 insertions, 8 deletions

diff --git a/Setup.hs b/Setup.hs
index 455909795..829115642 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -38,17 +38,12 @@ main = do
 
 -- | Run test suite.
 runTestSuite :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO a
-runTestSuite _ _ pkg lbi = do
+runTestSuite args _ pkg lbi = do
   let testDir = buildDir lbi </> "test-pandoc"
   testDir' <- canonicalizePath testDir
+  let testArgs = concatMap (\arg -> ["-t",arg]) args
   if any id [buildable (buildInfo exe) | exe <- executables pkg, exeName exe == "test-pandoc"]
-     then do
-         let isHighlightingKate (Dependency (PackageName "highlighting-kate") _) = True
-             isHighlightingKate _ = False
-         let highlightingSupport = any isHighlightingKate $ buildDepends pkg
-         let testArgs = ["lhs" | highlightingSupport]
-         inDirectory "tests" $ rawSystem (testDir' </> "test-pandoc")
-                                 testArgs >>= exitWith
+     then inDirectory "tests" $ rawSystem (testDir' </> "test-pandoc") testArgs >>= exitWith
      else do
          putStrLn "Build pandoc with the 'tests' flag to run tests"
          exitWith $ ExitFailure 3