Update Makefile and .travis.yml

kolanos · Aug 9, 2012 · 0554f99 · 0554f99
1 parent f1c3492
commit 0554f99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,4 +4,4 @@ python:
 install:
   - pip install nose
   - python setup.py install
-script: nosetests -w ../
+script: make travis
diff --git a/Makefile b/Makefile
@@ -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