Permalink
Browse files

Update Makefile and .travis.yml

  • Loading branch information...
kolanos committed Aug 9, 2012
1 parent f1c3492 commit 0554f99464008c92e9a01ccaba403bb077dd65c2
Showing with 5 additions and 5 deletions.
  1. +1 −1 .travis.yml
  2. +4 −4 Makefile
View
@@ -4,4 +4,4 @@ python:
install:
- pip install nose
- python setup.py install
-script: nosetests -w ../
+script: make travis
View
@@ -22,13 +22,13 @@ init:
pip install -r requirements.txt
test:
- nosetests -w ./
+ nosetests ./tests/*
lazy:
- nosetests --with-color -w ./
+ nosetests --with-color ./tests/*
simple:
- nosetests -w ./
+ nosetests ./tests/*
pyflakes:
pyflakes ${PYFLAKES_WHITELIST}
@@ -37,7 +37,7 @@ cipyflakes:
${PYFLAKES_IF_AVAILABLE} ${PYFLAKES_WHITELIST}
citests:
- nosetests -w ./ --with-xunit --xunit-file=junit-report.xml
+ nosetests ${CI_TESTS} --with-xunit --xunit-file=junit-report.xml
ci: citests cipyflakes

0 comments on commit 0554f99

Please sign in to comment.