Merge pull request #417 from koenpunt/travis_tweaks

Split tests by shell
master
Jordan Harband 2014-05-10 10:13:53 -07:00
commit 2441b00262
2 changed files with 11 additions and 6 deletions

View File

@ -4,5 +4,11 @@ install:
before_script: before_script:
- curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin && chmod +x /tmp/urchin - curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin && chmod +x /tmp/urchin
script: 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

View File

@ -1,15 +1,14 @@
URCHIN=`which urchin` URCHIN=`which urchin`
SHELLS=sh bash dash ksh zsh SHELLS=sh bash dash ksh zsh
TEST_SUITE=fast
.PHONY: $(SHELLS) test .PHONY: $(SHELLS) test
fast: $(SHELLS)
$(SHELLS): $(SHELLS):
@printf '\n\033[0;34m%s\033[0m\n' "Running tests in $@" @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 @$(URCHIN) -f test/slow
default: test default: test