[commit: ghc] master: Sdist -> bindist -> tests (6f665cc)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6f665cccd7ef5cc4806d2c1e46a602bed7a7201d/ghc

>---------------------------------------------------------------

commit 6f665cccd7ef5cc4806d2c1e46a602bed7a7201d
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Fri Oct 27 19:02:33 2017 +0100

    Sdist -> bindist -> tests


>---------------------------------------------------------------

6f665cccd7ef5cc4806d2c1e46a602bed7a7201d
 .circleci/build.sh          | 22 ++++++++++++++++++----
 .circleci/prepare-system.sh |  9 +++++++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.circleci/build.sh b/.circleci/build.sh
index 74d5ea7..2cc1d0e 100755
--- a/.circleci/build.sh
+++ b/.circleci/build.sh
@@ -8,9 +8,6 @@ fail() {
   exit 1
 }
 
-echo 'BUILD_SPHINX_HTML = NO' > mk/validate.mk
-echo 'BUILD_SPHINX_PDF = NO' >> mk/validate.mk
-
 cat > mk/build.mk <<EOF
 V=1
 HADDOCK_DOCS=YES
@@ -25,11 +22,28 @@ export SKIP_PERF_TESTS=YES
 export VERBOSE=2
 
 function run_build() {
+    mk/get-win32-tarballs.sh download all
+    ./boot
+    ./configure "$@"
+    make sdist
+    mkdir -p sdist-build-dir
+    pushd sdist-build-dir
+    shopt -s extglob
+    tar xvfJ ../sdistprep/ghc-*+([[:digit:]])-src.tar.xz sdist-build-dir
+    cd ghc-*
     ./boot
     ./configure "$@"
     make -j$THREADS
-    make test
     make binary-dist
+    popd
+    mkdir -p bdist-test-dir
+    pushd bdist-test-dir
+    tar xvfJ ../sdist-build-dir/ghc-*/ghc-*.tar.xz
+    tar xvfJ ../sdistprep/ghc*testsuite.tar.xz
+    cd ghc-*
+    ./configure
+    # TODO: JUnit formatting for pretty CircleCI thing.
+    make test
 }
 
 case "$(uname)" in
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index 5d4d630..7cf1a05 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -14,7 +14,10 @@ case "$(uname)" in
         # cross-compiling to FreeBSD
         add-apt-repository -y ppa:hvr/ghc
         apt-get update -qq
-        apt-get install -qy ghc-8.0.2 cabal-install  alex happy ncurses-dev git openssh-client make automake autoconf gcc perl python3 texinfo xz-utils
+        apt-get install -qy \
+                ghc-8.0.2 cabal-install alex happy ncurses-dev git \
+                openssh-client make automake autoconf gcc perl \
+                python3 texinfo xz-utils xutils-dev curl
         cabal update
         cabal install --reinstall hscolour
         ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
@@ -24,7 +27,9 @@ case "$(uname)" in
     else
       # assuming Ubuntu
       apt-get update -qq
-      apt-get install -qy git openssh-client make automake autoconf gcc perl python3 texinfo xz-utils
+      apt-get install -qy \
+              git openssh-client make automake autoconf gcc perl python3 \
+              texinfo xz-utils xutils-dev curl
       cabal update
       cabal install --reinstall hscolour
     fi