Merge pull request #1017 from jerith666/fix-tests

update run-tests.sh to work with 0.19

Author: evancz

.gitignore

@@ -1,3 +1,7 @@
 elm-stuff
 tests/test.js
-node_modules/
+node_modules/
+*.dat
+doc*.json
+tests/.elm
+*~

.travis.yml

@@ -1,35 +1,4 @@
-sudo: false
-
-cache:
-  directories:
-    - test/elm-stuff/build-artifacts
-    - sysconfcpus
-
-language: node_js
-
-node_js:
-  - "4.3"
-
-before_install:
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];
-    then brew update; brew install nvm; mkdir ~/.nvm; export NVM_DIR=~/.nvm; source $(brew --prefix nvm)/nvm.sh;
-    fi
-  - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-  - | # epic build time improvement - see https://github.com/elm-lang/elm-compiler/issues/1473#issuecomment-245704142
-    if [ ! -d sysconfcpus/bin ];
-    then
-      git clone https://github.com/obmarg/libsysconfcpus.git;
-      cd libsysconfcpus;
-      ./configure --prefix=$TRAVIS_BUILD_DIR/sysconfcpus;
-      make && make install;
-      cd ..;
-    fi
-
-install:
-  - npm install -g [email protected] elm-test
-  - mv $(npm config get prefix)/bin/elm-make $(npm config get prefix)/bin/elm-make-old
-  - printf '%s\n\n' '#!/bin/bash' 'echo "Running elm-make with sysconfcpus -n 2"' '$TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 elm-make-old "$@"' > $(npm config get prefix)/bin/elm-make
-  - chmod +x $(npm config get prefix)/bin/elm-make
+language: elm
 
 script:
   - bash tests/run-tests.sh

tests/elm-package.json

@@ -0,0 +1,26 @@
+{
+    "type": "application",
+    "source-directories": [],
+    "elm-version": "0.19.0",
+    "dependencies": {
+        "direct": {
+            "elm/browser": "1.0.1",
+            "elm/core": "1.0.2",
+            "elm/html": "1.0.0"
+        },
+        "indirect": {
+            "elm/json": "1.1.2",
+            "elm/time": "1.0.0",
+            "elm/url": "1.0.0",
+            "elm/virtual-dom": "1.0.2"
+        }
+    },
+    "test-dependencies": {
+        "direct": {
+            "elm-explorations/test": "1.2.1"
+        },
+        "indirect": {
+            "elm/random": "1.0.0"
+        }
+    }
+}

tests/elm.json

@@ -1,19 +1,69 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-cd "$(dirname "$0")"
-set -e
+set -o errexit;
+set -o nounset;
 
+#let the caller supply an ELM_TEST binary if desired
+if [ -z "${ELM_TEST:-}" ]; then
+    ELM_TEST=elm-test;
+fi
 
-elm-package install -y
+# since elm/core is treated specially by the compiler (it's always
+# inserted as a dependency even when not declared explicitly), we use
+# a bit of a hack to make the tests run against the local source code
+# rather than the elm/core source fetched from package.elm-lang.org.
 
-VERSION_DIR="$(ls elm-stuff/packages/elm-lang/core/)"
-CORE_PACKAGE_DIR="elm-stuff/packages/elm-lang/core/$VERSION_DIR"
+# create a local directory where the compiler will look for the
+# elm/core source code:
+
+DIR="$(dirname $0)";
+
+cd "$DIR";
+
+export ELM_HOME="$(pwd)/.elm";
+
+rm -rf "$ELM_HOME" && mkdir -p "$ELM_HOME";
+
+# elm-test also puts some things in elm-stuff, start with a clean
+# slate there as well
+
+rm -rf elm-stuff;
+
+# now make an initial run of the tests to populate .elm and elm-stuff;
+# this will test against elm/core from package.elm-lang.org, so we
+# don't really care what the results are; we just need to force all
+# the *other* dependencies to be fetched and set up.
+
+echo "seeding framework for test dependencies ...";
+
+# '|| true' lets us ignore failures here and keep the script running.
+# useful when developing a fix for a bug that exists in the version of
+# elm/core hosted on package.elm-lang.org
+"${ELM_TEST}" tests/Main.elm > /dev/null || true;
+
+# clear out the copy of elm-core fetched by the above and replace it
+# with the local source code we want to actually test
+
+VERSION_DIR="$(ls ${ELM_HOME}/0.19.0/package/elm/core/)"
+CORE_PACKAGE_DIR="${ELM_HOME}/0.19.0/package/elm/core/$VERSION_DIR"
 CORE_GIT_DIR="$(dirname $PWD)"
 
+echo;
 echo "Linking $CORE_PACKAGE_DIR to $CORE_GIT_DIR"
-rm -rf $CORE_PACKAGE_DIR
-ln -s $CORE_GIT_DIR $CORE_PACKAGE_DIR
+echo;
+rm -rf "$CORE_PACKAGE_DIR"
+ln -sv "$CORE_GIT_DIR" "$CORE_PACKAGE_DIR"
+rm -vf "${CORE_GIT_DIR}"/*.dat "${CORE_GIT_DIR}"/doc*.json
+
+# we also need to clear out elm-test's elm-stuff dir, since otherwise
+# the compiler complains that its .dat files are out of sync
+
+rm -rf elm-stuff;
+
+# now we can run the tests against the symlinked source code for real
 
-elm-make --yes --output test.js Main.elm
+echo;
+echo "running tests ...";
+echo;
 
-elm-test Main.elm
+"${ELM_TEST}" tests/Main.elm;