-
Notifications
You must be signed in to change notification settings - Fork 697
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove --cabal-file flag from v2 commands
- Loading branch information
1 parent
2564b54
commit 3c2c6b8
Showing
31 changed files
with
146 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/Includes2.cabal
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| name: fail | ||
| version: 0.1.0.0 | ||
| license: BSD3 | ||
| author: Edward Z. Yang | ||
| maintainer: ezyang@cs.stanford.edu | ||
| build-type: Simple | ||
| cabal-version: 2.0 | ||
|
|
||
| library mylib | ||
| build-depends: base | ||
| signatures: Database | ||
| exposed-modules: Mine | ||
| hs-source-dirs: mylib | ||
| default-language: Haskell2010 | ||
|
|
||
| library mysql | ||
| build-depends: base | ||
| exposed-modules: Database.MySQL | ||
| hs-source-dirs: mysql | ||
| default-language: Haskell2010 | ||
|
|
||
| library postgresql | ||
| build-depends: base | ||
| exposed-modules: Database.PostgreSQL | ||
| hs-source-dirs: postgresql | ||
| default-language: Haskell2010 | ||
|
|
||
| library | ||
| build-depends: base, mysql, postgresql, mylib | ||
| mixins: | ||
| mysql (Database.MySQL as Database), | ||
| postgresql (Database.PostgreSQL as Database) | ||
| exposed-modules: App | ||
| hs-source-dirs: src | ||
| default-language: Haskell2010 |
1 change: 1 addition & 0 deletions
1
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mylib
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../mylib |
1 change: 1 addition & 0 deletions
1
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mysql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../mysql |
1 change: 1 addition & 0 deletions
1
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/postgresql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../postgresql |
1 change: 1 addition & 0 deletions
1
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/src
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../src |
41 changes: 41 additions & 0 deletions
41
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/Includes2.cabal
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| name: Includes2 | ||
| version: 0.1.0.0 | ||
| license: BSD3 | ||
| author: Edward Z. Yang | ||
| maintainer: ezyang@cs.stanford.edu | ||
| build-type: Simple | ||
| cabal-version: 2.0 | ||
|
|
||
| library mylib | ||
| build-depends: base | ||
| signatures: Database | ||
| exposed-modules: Mine | ||
| hs-source-dirs: mylib | ||
| default-language: Haskell2010 | ||
|
|
||
| library mysql | ||
| build-depends: base | ||
| exposed-modules: Database.MySQL | ||
| hs-source-dirs: mysql | ||
| default-language: Haskell2010 | ||
|
|
||
| library postgresql | ||
| build-depends: base | ||
| exposed-modules: Database.PostgreSQL | ||
| hs-source-dirs: postgresql | ||
| default-language: Haskell2010 | ||
|
|
||
| library | ||
| build-depends: base, mysql, postgresql, mylib | ||
| mixins: | ||
| mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL), | ||
| mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL) | ||
| exposed-modules: App | ||
| hs-source-dirs: src | ||
| default-language: Haskell2010 | ||
|
|
||
| executable exe | ||
| build-depends: base, Includes2 | ||
| main-is: Main.hs | ||
| hs-source-dirs: exe | ||
| default-language: Haskell2010 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../exe |
1 change: 1 addition & 0 deletions
1
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mylib
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../mylib |
1 change: 1 addition & 0 deletions
1
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mysql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../mysql |
1 change: 1 addition & 0 deletions
1
cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/postgresql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../postgresql |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../src |
2 changes: 1 addition & 1 deletion
2
cabal-testsuite/PackageTests/Backpack/Includes2/cabal.internal.project
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| packages: . | ||
| packages: ./Includes2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal-fail.test.hs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import Test.Cabal.Prelude | ||
| main = setupAndCabalTest $ do | ||
| skipUnlessGhcVersion ">= 8.1" | ||
| r <- fails $ setup' "configure" ["--cabal-file", "Includes2.cabal.fail"] | ||
| r <- fails $ withDirectory "Includes2-fail" $ setup' "configure" [] | ||
| assertOutputContains "mysql" r |
9 changes: 5 additions & 4 deletions
9
cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal.test.hs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| import Test.Cabal.Prelude | ||
| main = setupAndCabalTest $ do | ||
| skipUnlessGhcVersion ">= 8.1" | ||
| withPackageDb $ do | ||
| setup_install ["--cabal-file", "Includes2.cabal"] | ||
| -- TODO: haddock for internal method doesn't work | ||
| runExe "exe" [] | ||
| withPackageDb $ | ||
| withDirectory "Includes2" $ do | ||
| setup_install [] | ||
| -- TODO: haddock for internal method doesn't work | ||
| runExe "exe" [] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.