From da4dc9d2101a2b63134aabf50e0f10d528bdbe9e Mon Sep 17 00:00:00 2001
From: Luke Childs <lukechilds123@gmail.com>
Date: Thu, 24 Sep 2015 22:41:48 +0100
Subject: [PATCH] Run tests from direct from urchin not make

---
 .travis.yml | 57 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c13175..3f9d457 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,35 +4,34 @@ addons:
   - zsh
   - ksh
 install:
-  - (mkdir /tmp/urchin && cd /tmp/urchin && curl -s "$(curl -s https://registry.npmjs.com/urchin | grep -Eo '"tarball":\s*"[^"]+"' | tail -n 1 | awk -F\" '{ print $4 }')" -O && tar -x -f urchin*)
-  - chmod +x /tmp/urchin/package/urchin
+  - (cd /usr/local/bin && wget https://raw.github.com/tlevine/urchin/master/urchin && chmod +x urchin)
   - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'
 script:
-  - make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL
+  - urchin -f -s "$TEST_SHELL" "test/$TEST_SUITE"
 env:
-  - SHELL=bash TEST_SUITE=install_script
-  - SHELL=sh TEST_SUITE=fast
-  - SHELL=dash TEST_SUITE=fast
-  - SHELL=bash TEST_SUITE=fast
-  - SHELL=zsh TEST_SUITE=fast
-#  - SHELL=ksh TEST_SUITE=fast
-  - SHELL=sh TEST_SUITE=slow
-  - SHELL=dash TEST_SUITE=slow
-  - SHELL=bash TEST_SUITE=slow
-  - SHELL=zsh TEST_SUITE=slow
-#  - SHELL=ksh TEST_SUITE=slow
-  - SHELL=sh TEST_SUITE=sourcing
-  - SHELL=dash TEST_SUITE=sourcing
-  - SHELL=bash TEST_SUITE=sourcing
-  - SHELL=zsh TEST_SUITE=sourcing
-#  - SHELL=ksh TEST_SUITE=sourcing
-  - SHELL=sh TEST_SUITE=installation
-  - SHELL=sh TEST_SUITE=installation WITHOUT_CURL=1
-  - SHELL=dash TEST_SUITE=installation
-  - SHELL=dash TEST_SUITE=installation WITHOUT_CURL=1
-  - SHELL=bash TEST_SUITE=installation
-  - SHELL=bash TEST_SUITE=installation WITHOUT_CURL=1
-  - SHELL=zsh TEST_SUITE=installation
-  - SHELL=zsh TEST_SUITE=installation WITHOUT_CURL=1
-#  - SHELL=ksh TEST_SUITE=installation
-#  - SHELL=ksh TEST_SUITE=installation WITHOUT_CURL=1
+  - TEST_SHELL=bash TEST_SUITE=install_script
+  - TEST_SHELL=sh TEST_SUITE=fast
+  - TEST_SHELL=dash TEST_SUITE=fast
+  - TEST_SHELL=bash TEST_SUITE=fast
+  - TEST_SHELL=zsh TEST_SUITE=fast
+#  - TEST_SHELL=ksh TEST_SUITE=fast
+  - TEST_SHELL=sh TEST_SUITE=slow
+  - TEST_SHELL=dash TEST_SUITE=slow
+  - TEST_SHELL=bash TEST_SUITE=slow
+  - TEST_SHELL=zsh TEST_SUITE=slow
+#  - TEST_SHELL=ksh TEST_SUITE=slow
+  - TEST_SHELL=sh TEST_SUITE=sourcing
+  - TEST_SHELL=dash TEST_SUITE=sourcing
+  - TEST_SHELL=bash TEST_SUITE=sourcing
+  - TEST_SHELL=zsh TEST_SUITE=sourcing
+#  - TEST_SHELL=ksh TEST_SUITE=sourcing
+  - TEST_SHELL=sh TEST_SUITE=installation
+  - TEST_SHELL=sh TEST_SUITE=installation WITHOUT_CURL=1
+  - TEST_SHELL=dash TEST_SUITE=installation
+  - TEST_SHELL=dash TEST_SUITE=installation WITHOUT_CURL=1
+  - TEST_SHELL=bash TEST_SUITE=installation
+  - TEST_SHELL=bash TEST_SUITE=installation WITHOUT_CURL=1
+  - TEST_SHELL=zsh TEST_SUITE=installation
+  - TEST_SHELL=zsh TEST_SUITE=installation WITHOUT_CURL=1
+#  - TEST_SHELL=ksh TEST_SUITE=installation
+#  - TEST_SHELL=ksh TEST_SUITE=installation WITHOUT_CURL=1