From ceadf33246bcc42747b42c10c108bfc7d8663ab7 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 19 Mar 2021 23:35:47 -0700
Subject: [PATCH] Tests: Use getExecutablePath from base...
avoiding the need to depend on the executable-path package.
---
pandoc.cabal | 1 -
test/Tests/Command.hs | 2 +-
test/Tests/Old.hs | 2 +-
test/test-pandoc.hs | 3 +--
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/pandoc.cabal b/pandoc.cabal
index 6338a4fdc..b70c98e58 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -748,7 +748,6 @@ test-suite test-pandoc
directory >= 1.2.3 && < 1.4,
doctemplates >= 0.9 && < 0.10,
exceptions >= 0.8 && < 0.11,
- executable-path >= 0.0 && < 0.1,
filepath >= 1.1 && < 1.5,
hslua >= 1.1 && < 1.4,
mtl >= 2.2 && < 2.3,
diff --git a/test/Tests/Command.hs b/test/Tests/Command.hs
index e8863b545..3ec6d7230 100644
--- a/test/Tests/Command.hs
+++ b/test/Tests/Command.hs
@@ -13,7 +13,7 @@ module Tests.Command (runTest, tests)
where
import Data.Algorithm.Diff
-import System.Environment.Executable (getExecutablePath)
+import System.Environment (getExecutablePath)
import qualified Data.ByteString as BS
import qualified Data.Text as T
import Data.List (isSuffixOf)
diff --git a/test/Tests/Old.hs b/test/Tests/Old.hs
index c7b164f3c..ad9f249c4 100644
--- a/test/Tests/Old.hs
+++ b/test/Tests/Old.hs
@@ -14,7 +14,7 @@ module Tests.Old (tests) where
import Data.Algorithm.Diff
import System.Exit
import System.FilePath ((<.>), (</>))
-import System.Environment.Executable (getExecutablePath)
+import System.Environment (getExecutablePath)
import Text.Pandoc.Process (pipeProcess)
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.Golden.Advanced (goldenTest)
diff --git a/test/test-pandoc.hs b/test/test-pandoc.hs
index 4d9da525b..abb2f105f 100644
--- a/test/test-pandoc.hs
+++ b/test/test-pandoc.hs
@@ -2,12 +2,11 @@
module Main where
-import System.Environment (getArgs)
+import System.Environment (getArgs, getExecutablePath)
import qualified Control.Exception as E
import Text.Pandoc.App (convertWithOpts, defaultOpts, options,
parseOptionsFromArgs)
import Text.Pandoc.Error (handleError)
-import System.Environment.Executable (getExecutablePath)
import GHC.IO.Encoding
import Test.Tasty
import qualified Tests.Command