Skip to content

Commit

Permalink
Merge pull request #417 from koenpunt/travis_tweaks
Browse files Browse the repository at this point in the history
Split tests by shell
  • Loading branch information
ljharb committed May 10, 2014
2 parents 4de9eff + 88595f0 commit 2441b00
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
10 changes: 8 additions & 2 deletions .travis.yml
Expand Up @@ -4,5 +4,11 @@ install:
before_script:
- curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin && chmod +x /tmp/urchin
script:
- NVM_DIR=$TRAVIS_BUILD_DIR make URCHIN=/tmp/urchin test

- NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL
env:
- 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
7 changes: 3 additions & 4 deletions Makefile
@@ -1,15 +1,14 @@
URCHIN=`which urchin`
SHELLS=sh bash dash ksh zsh
TEST_SUITE=fast

.PHONY: $(SHELLS) test

fast: $(SHELLS)

$(SHELLS):
@printf '\n\033[0;34m%s\033[0m\n' "Running tests in $@"
@$@ $(URCHIN) -f test/fast
@$@ $(URCHIN) -f test/$(TEST_SUITE)

test: fast
test: $(SHELLS)
@$(URCHIN) -f test/slow

default: test
Expand Down

0 comments on commit 2441b00

Please sign in to comment.