File tree Expand file tree Collapse file tree 8 files changed +4
-148
lines changed
UnitTests/Distribution/Compat
cabal-testsuite/src/Test/Cabal Expand file tree Collapse file tree 8 files changed +4
-148
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,6 @@ test-suite unit-tests
26
26
Test.Laws
27
27
Test.QuickCheck.Utils
28
28
UnitTests.Distribution.CabalSpecVersion
29
- UnitTests.Distribution.Compat.CreatePipe
30
29
UnitTests.Distribution.Compat.Graph
31
30
UnitTests.Distribution.Compat.Time
32
31
UnitTests.Distribution.Described
Original file line number Diff line number Diff line change @@ -13,7 +13,6 @@ import Distribution.Simple.Utils
13
13
import Distribution.Verbosity
14
14
import Distribution.Compat.Time
15
15
16
- import qualified UnitTests.Distribution.Compat.CreatePipe
17
16
import qualified UnitTests.Distribution.Compat.Time
18
17
import qualified UnitTests.Distribution.Compat.Graph
19
18
import qualified UnitTests.Distribution.Simple.Command
@@ -44,9 +43,7 @@ tests mtimeChangeCalibrated =
44
43
else mtimeChangeCalibrated
45
44
in
46
45
testGroup " Unit Tests"
47
- [ testGroup " Distribution.Compat.CreatePipe"
48
- UnitTests.Distribution.Compat.CreatePipe. tests
49
- , testGroup " Distribution.Compat.Time"
46
+ [ testGroup " Distribution.Compat.Time"
50
47
(UnitTests.Distribution.Compat.Time. tests mtimeChange)
51
48
, testGroup " Distribution.Compat.Graph"
52
49
UnitTests.Distribution.Compat.Graph. tests
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -96,7 +96,6 @@ library
96
96
Distribution.Utils.MD5
97
97
Distribution.Utils.String
98
98
Distribution.Utils.Structured
99
- Distribution.Compat.CreatePipe
100
99
Distribution.Compat.Directory
101
100
Distribution.Compat.Environment
102
101
Distribution.Compat.Exception
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -9,7 +9,6 @@ import Prelude ()
9
9
import Distribution.Compat.Prelude
10
10
11
11
import Distribution.Types.UnqualComponentName
12
- import Distribution.Compat.CreatePipe
13
12
import Distribution.Compat.Environment
14
13
import qualified Distribution.PackageDescription as PD
15
14
import Distribution.Simple.Build.PathsModule
@@ -32,6 +31,7 @@ import System.Directory
32
31
, getCurrentDirectory , removeDirectoryRecursive )
33
32
import System.FilePath ( (</>) , (<.>) )
34
33
import System.IO ( stdout , stderr )
34
+ import System.Process ( createPipe )
35
35
36
36
import qualified Data.ByteString.Lazy as LBS
37
37
Original file line number Diff line number Diff line change @@ -13,7 +13,6 @@ import Prelude ()
13
13
import Distribution.Compat.Prelude
14
14
import Distribution.Types.UnqualComponentName
15
15
16
- import Distribution.Compat.CreatePipe
17
16
import Distribution.Compat.Environment
18
17
import Distribution.Compat.Internal.TempFile
19
18
import Distribution.ModuleName
@@ -42,7 +41,7 @@ import System.Directory
42
41
, setCurrentDirectory )
43
42
import System.FilePath ( (</>) , (<.>) )
44
43
import System.IO ( hClose , hPutStr )
45
- import System.Process (StdStream (.. ), waitForProcess )
44
+ import System.Process (StdStream (.. ), createPipe , waitForProcess )
46
45
47
46
runTest :: PD. PackageDescription
48
47
-> LBI. LocalBuildInfo
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ module Test.Cabal.Run (
5
5
Result (.. )
6
6
) where
7
7
8
- import qualified Distribution.Compat.CreatePipe as Compat
9
8
import Distribution.Simple.Program.Run
10
9
import Distribution.Verbosity
11
10
@@ -46,7 +45,7 @@ run _verbosity mb_cwd env_overrides path0 args input = do
46
45
47
46
mb_env <- getEffectiveEnvironment env_overrides
48
47
putStrLn $ " + " ++ showCommandForUser path args
49
- (readh, writeh) <- Compat. createPipe
48
+ (readh, writeh) <- createPipe
50
49
hSetBuffering readh LineBuffering
51
50
hSetBuffering writeh LineBuffering
52
51
let drain = do
You can’t perform that action at this time.
0 commit comments