Skip to content
Snippets Groups Projects
Commit a79f9a40 authored by kristenk's avatar kristenk
Browse files

Quote cabal and ghc-pkg paths in cabal-install integration tests

Spaces in the path to ghc-pkg caused two tests to fail when run with the
Haskell Platform on Windows.
parent 7ae9259e
No related branches found
No related tags found
No related merge requests found
# Helper to run Cabal
cabal() {
$CABAL $CABAL_ARGS "$@"
"$CABAL" $CABAL_ARGS "$@"
}
die() {
......
# Helper to run Cabal
cabal() {
$CABAL $CABAL_ARGS "$@"
"$CABAL" $CABAL_ARGS "$@"
}
die() {
......
......@@ -7,8 +7,8 @@ cabal sandbox init > /dev/null
cabal install > /dev/null
# The library should not be available outside the sandbox
$GHC_PKG list | grep -v "my-0.1"
"$GHC_PKG" list | grep -v "my-0.1"
# When run inside 'cabal-exec' the 'sandbox hc-pkg list' sub-command
# should find the library.
cabal exec sh -- -c 'cd subdir && $CABAL sandbox hc-pkg list' | grep "my-0.1"
cabal exec sh -- -c 'cd subdir && "$CABAL" sandbox hc-pkg list' | grep "my-0.1"
......@@ -7,7 +7,7 @@ cabal sandbox init > /dev/null
cabal install > /dev/null
# The library should not be available outside the sandbox
$GHC_PKG list | grep -v "my-0.1"
"$GHC_PKG" list | grep -v "my-0.1"
# Execute ghc-pkg inside the sandbox; it should find my-0.1
cabal exec ghc-pkg list | grep "my-0.1"
# Helper to run Cabal
cabal() {
$CABAL $CABAL_ARGS "$@"
"$CABAL" $CABAL_ARGS "$@"
}
die() {
......
# Helper to run Cabal
cabal() {
$CABAL $CABAL_ARGS "$@"
"$CABAL" $CABAL_ARGS "$@"
}
die() {
......
cabal() {
$CABAL $CABAL_ARGS "$@"
"$CABAL" $CABAL_ARGS "$@"
}
die() {
......
cabal() {
$CABAL $CABAL_ARGS "$@"
"$CABAL" $CABAL_ARGS "$@"
}
die() {
......
# Helper to run Cabal
cabal() {
$CABAL $CABAL_ARGS_NO_CONFIG_FILE "$@"
"$CABAL" $CABAL_ARGS_NO_CONFIG_FILE "$@"
}
die() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment