[commit: ghc] wip/jenkins: Handle testsuite on Windows (9e9481c)
git at git.haskell.org
git at git.haskell.org
Thu Jul 27 20:50:09 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/jenkins
Link : http://ghc.haskell.org/trac/ghc/changeset/9e9481c9b598ec24ff19ff35eb55aef38cdb6b22/ghc
>---------------------------------------------------------------
commit 9e9481c9b598ec24ff19ff35eb55aef38cdb6b22
Author: Ben Gamari <ben at smart-cactus.org>
Date: Sat Jun 17 22:53:30 2017 -0400
Handle testsuite on Windows
>---------------------------------------------------------------
9e9481c9b598ec24ff19ff35eb55aef38cdb6b22
Jenkinsfile | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 179421e..b754745 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -265,16 +265,21 @@ def withGhcBinDist(String targetTriple, Closure f) {
def testGhc(params) {
String targetTriple = params?.targetTriple
// See Note [Spaces in TEST_HC]
- String instDir="bindisttest/install dir"
String testGhc="${instDir}/bin/ghc"
String makeCmd = params?.makeCmd ?: 'make'
+ String instDir="${pwd()}/bindisttest/install dir"
withGhcBinDist(targetTriple) {
stage('Configure') {
echo 'echo $PATH'
sh "which ghc"
- sh "./configure --prefix=\"`pwd`/${instDir}\""
- sh "${makeCmd} install"
+ if (isUnix()) {
+ sh "./configure --prefix=\"${instDir}\""
+ sh "${makeCmd} install"
+ } else {
+ sh "mkdir -p \"${instDir}\""
+ sh "cp -R * ${instDir}"
+ }
}
stage('Install testsuite dependencies') {
More information about the ghc-commits
mailing list