Skip to content

Commit 58f2ee7

Browse files
sheafsheaf
committed
fixup test outputs
1 parent f9afc3a commit 58f2ee7

File tree

15 files changed

+11
-32
lines changed

15 files changed

+11
-32
lines changed

‎cabal-testsuite/PackageTests/Exec/cabal.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ In order, the following will be built:
66
Configuring my-0.1...
77
Preprocessing executable 'my-executable' for my-0.1...
88
Building executable 'my-executable' for my-0.1...
9+
Preprocessing library for my-0.1...
10+
Building library for my-0.1...
911
# my my-executable
1012
This is my-executable

‎cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
# cabal v2-run
2-
Resolving dependencies...
3-
Build profile: -w ghc-<GHCVER> -O1
4-
In order, the following will be built:
5-
- fake-package-0 (exe:script-script.hs) (first run)
6-
Configuring executable 'script-script.hs' for fake-package-0...
7-
Building executable 'script-script.hs' for fake-package-0...

‎cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Test.Cabal.Prelude
22

3-
main = cabalTest $ do
3+
main = cabalTest $ recordMode DoNotRecord $ do
44
res <- cabal' "v2-run" ["script.hs"]
55
assertOutputContains "Hello World" res
66

‎cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# cabal v2-run
2+
The package description file ./script.cabal has warnings: script.cabal:0:0: A package using 'cabal-version: >=1.10' must use section syntax. See the Cabal user guide for details.
23
Error: [Cabal-7121]
34
Failed extracting script block: `{- cabal:` start marker not found

‎cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
# cabal v2-run
2-
Resolving dependencies...
3-
Build profile: -w ghc-<GHCVER> -O1
4-
In order, the following will be built:
5-
- fake-package-0 (exe:script-script.lhs) (first run)
6-
Configuring executable 'script-script.lhs' for fake-package-0...
7-
Building executable 'script-script.lhs' for fake-package-0...

‎cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.test.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Test.Cabal.Prelude
22

3-
main = cabalTest $ do
3+
main = cabalTest $ recordMode DoNotRecord $ do
44
res <- cabal' "v2-run" ["script.lhs"]
55
assertOutputContains "Hello World" res

‎cabal-testsuite/PackageTests/NewConfigure/ConfigFile/cabal.out‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# cabal v2-configure
2+
The package description file ./ConfigFile.cabal has warnings: ConfigFile.cabal:0:0: A package using 'cabal-version: >=1.10' must use section syntax. See the Cabal user guide for details.
23
Config file not written due to flag(s).
34
# cabal v2-configure
45
Config file not written due to flag(s).

‎cabal-testsuite/PackageTests/Project/CoverageProject/cabal.out‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ In order, the following will be built:
55
- pkg-a-0.1 (lib) (first run)
66
- pkg-a-0.1 (test:testing) (first run)
77
Configuring library for pkg-a-0.1...
8-
Warning: [no-default-language] Packages using 'cabal-version: >= 1.10' and before 'cabal-version: 3.4' must specify the 'default-language' field for each component (e.g. Haskell98 or Haskell2010). If a component uses different languages in different modules then list the other ones in the 'other-languages' field.
98
Preprocessing library for pkg-a-0.1...
109
Building library for pkg-a-0.1...
1110
Configuring test suite 'testing' for pkg-a-0.1...
12-
Warning: [no-default-language] Packages using 'cabal-version: >= 1.10' and before 'cabal-version: 3.4' must specify the 'default-language' field for each component (e.g. Haskell98 or Haskell2010). If a component uses different languages in different modules then list the other ones in the 'other-languages' field.
1311
Preprocessing test suite 'testing' for pkg-a-0.1...
1412
Building test suite 'testing' for pkg-a-0.1...
1513
Running 1 test suites...

‎cabal-testsuite/PackageTests/Project/CoverageProject/pkg-a/pkg-a.cabal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ library
1818
test-suite testing
1919
type: exitcode-stdio-1.0
2020
build-depends: base, pkg-a
21+
default-language: Haskell2010
2122
main-is: Main.hs
2223
hs-source-dirs: test
2324

‎cabal-testsuite/PackageTests/Regression/T5318/install.out‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
# cabal v1-install
2-
Resolving dependencies...
3-
Configuring empty-data-dir-0...
4-
Preprocessing executable 'foo' for empty-data-dir-0...
5-
Building executable 'foo' for empty-data-dir-0...
6-
Installing executable foo in <PATH>
7-
Warning: The directory <ROOT>/install.dist/home/.cabal/bin is not in the system search path.
8-
Completed empty-data-dir-0

0 commit comments

Comments
 (0)