diff options
| author | Alp Mestanogullari <alpmestan@gmail.com> | 2019-05-27 13:05:32 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-07-23 23:06:36 -0400 |
| commit | 6ade71fbaa87c116c6ab8322259a795894cde1f6 (patch) | |
| tree | 2770e2e00c8dfc186cfc803bc27fad0d01dbdb86 /.gitlab-ci.yml | |
| parent | f9af30f856b0e6f78d6857fc6d69db3495bb1635 (diff) | |
| download | haskell-6ade71fbaa87c116c6ab8322259a795894cde1f6.tar.gz | |
Hadrian: run the testsuite in Windows CI job
Since MR !1025 fixed the Windows build, allowing us to build a binary
distribution, we can now run the testsuite in that CI job.
This required fixing 'createFileLink': it should not try to create
symlinks on Windows (that requires admin priviledges, which Hadrian can't
assume). We now instead fall back to copying.
This patch also removes some duplicated logic for iserv in the test rules,
where we handle our dependency on the iserv binaries in a special way.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16ae89c3e4..e02aba031d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -710,14 +710,19 @@ validate-x86_64-linux-fedora27: bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex' - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --flavour=Quick --docs=no-sphinx binary-dist" - mv _build/bindist/ghc*.tar.xz ghc.tar.xz - # FIXME: Testsuite disabled due to #16156. - # - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' + - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --flavour=quick test --summary-junit=./junit.xml --skip-perf" + # skipping perf tests for now since we build a quick-flavoured GHC, + # which might result in some broken perf tests? tags: - x86_64-windows artifacts: + reports: + junit: junit.xml + expire_in: 2 week when: always paths: - ghc.tar.xz + - junit.xml validate-x86_64-windows-hadrian: extends: .build-windows-hadrian |