Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Haskell
Cabal
Commits
b2e4856e
Commit
b2e4856e
authored
11 months ago
by
Javier Sagredo
Browse files
Options
Downloads
Patches
Plain Diff
Enable autoreconf tests on Windows
parent
7e0db765
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cabal-testsuite/PackageTests/Configure/cabal.test.hs
+21
-4
21 additions, 4 deletions
cabal-testsuite/PackageTests/Configure/cabal.test.hs
cabal-testsuite/PackageTests/Configure/setup.test.hs
+21
-5
21 additions, 5 deletions
cabal-testsuite/PackageTests/Configure/setup.test.hs
with
42 additions
and
9 deletions
cabal-testsuite/PackageTests/Configure/cabal.test.hs
+
21
−
4
View file @
b2e4856e
...
...
@@ -2,9 +2,26 @@ import Test.Cabal.Prelude
import
Control.Monad.IO.Class
import
Data.Maybe
import
System.Directory
import
System.Environment
import
Data.List
(
isSuffixOf
)
-- Test for 'build-type: Configure' example from the setup manual.
main
=
cabalTest
$
do
hasAutoreconf
<-
liftIO
$
fmap
isJust
$
findExecutable
"autoreconf"
skipUnless
"no autoreconf"
hasAutoreconf
_
<-
shell
"autoreconf"
[
"-i"
]
cabal
"v2-build"
[]
if
isWindows
then
do
(
mCI
,
mSh
)
<-
liftIO
$
(,)
<$>
lookupEnv
"CI"
<*>
lookupEnv
"SHELL"
case
(
mCI
,
mSh
)
of
(
Nothing
,
Nothing
)
->
skip
"Missing $SHELL"
(
Nothing
,
Just
sh
)
->
do
env
<-
getTestEnv
void
$
shell
sh
[
"-l"
,
"-c"
,
"cd $(cygpath -m '"
<>
testTmpDir
env
<>
"') && autoreconf -i"
]
cabal
"v2-build"
[]
(
Just
{},
_
)
->
do
env
<-
getTestEnv
void
$
shell
"C:
\\
msys64
\\
usr
\\
bin
\\
bash.exe"
[
"-l"
,
"-c"
,
"cd $(cygpath -m '"
<>
testTmpDir
env
<>
"') && autoreconf -i"
]
cabal
"v2-build"
[]
else
do
hasAutoreconf
<-
liftIO
$
fmap
isJust
$
findExecutable
"autoreconf"
skipUnless
"no autoreconf"
hasAutoreconf
_
<-
shell
"autoreconf"
[
"-i"
]
cabal
"v2-build"
[]
This diff is collapsed.
Click to expand it.
cabal-testsuite/PackageTests/Configure/setup.test.hs
+
21
−
5
View file @
b2e4856e
...
...
@@ -2,9 +2,25 @@ import Test.Cabal.Prelude
import
Control.Monad.IO.Class
import
Data.Maybe
import
System.Directory
import
System.Environment
-- Test for 'build-type: Configure' example from the setup manual.
main
=
setupTest
$
do
hasAutoreconf
<-
liftIO
$
fmap
isJust
$
findExecutable
"autoreconf"
skipUnless
"no autoreconf"
hasAutoreconf
_
<-
shell
"autoreconf"
[
"-i"
]
setup_build
[]
main
=
setupTest
$
if
isWindows
then
do
(
mCI
,
mSh
)
<-
liftIO
$
(,)
<$>
lookupEnv
"CI"
<*>
lookupEnv
"SHELL"
case
(
mCI
,
mSh
)
of
(
Nothing
,
Nothing
)
->
skip
"Missing $SHELL"
(
Nothing
,
Just
sh
)
->
do
env
<-
getTestEnv
void
$
shell
sh
[
"-l"
,
"-c"
,
"cd $(cygpath -m '"
<>
testTmpDir
env
<>
"') && autoreconf -i"
]
setup_build
[]
(
Just
{},
_
)
->
do
env
<-
getTestEnv
void
$
shell
"C:
\\
msys64
\\
usr
\\
bin
\\
bash.exe"
[
"-l"
,
"-c"
,
"cd $(cygpath -m '"
<>
testTmpDir
env
<>
"') && autoreconf -i"
]
setup_build
[]
else
do
hasAutoreconf
<-
liftIO
$
fmap
isJust
$
findExecutable
"autoreconf"
skipUnless
"no autoreconf"
hasAutoreconf
_
<-
shell
"autoreconf"
[
"-i"
]
setup_build
[]
This diff is collapsed.
Click to expand it.
Javier Sagredo
@Jasagredo
mentioned in commit
a89b8fba
·
10 months ago
mentioned in commit
a89b8fba
mentioned in commit a89b8fba448bf17a737f9a3f77ff4f552dca433e
Toggle commit list
Javier Sagredo
@Jasagredo
mentioned in commit
8fa4a27c
·
9 months ago
mentioned in commit
8fa4a27c
mentioned in commit 8fa4a27ca3fe0cd2f58280812807c0739bcaf49b
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment