no need for the extra task, every shell name is already a task

master
Koen Punt 2014-05-10 12:27:11 +02:00
parent 61de5f9ca3
commit 24e22dd8bc
2 changed files with 2 additions and 6 deletions

View File

@ -4,7 +4,7 @@ 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 SHELL=$SHELL TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin test_shell - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL
env: env:
- SHELL=sh TEST_SUITE=fast - SHELL=sh TEST_SUITE=fast
- SHELL=dash TEST_SUITE=fast - SHELL=dash TEST_SUITE=fast

View File

@ -1,7 +1,7 @@
URCHIN=`which urchin` URCHIN=`which urchin`
SHELLS=sh bash dash ksh zsh SHELLS=sh bash dash ksh zsh
.PHONY: $(SHELLS) test test_shell .PHONY: $(SHELLS) test
fast: $(SHELLS) fast: $(SHELLS)
@ -12,9 +12,5 @@ $(SHELLS):
test: fast test: fast
@$(URCHIN) -f test/slow @$(URCHIN) -f test/slow
test_shell:
@printf '\n\033[0;34m%s\033[0m\n' "Running tests in $(SHELL)"
@$(SHELL) $(URCHIN) -f test/$(TEST_SUITE)
default: test default: test