clean up for travis CI

.travis.yml

@@ -4,12 +4,12 @@ python:
     - "2.5"
     - "2.6"
     - "2.7"
-    - "pypy"
     - "3.2"
     - "3.3"
+    - "pypy"
 
 install:
     - python setup.py install
 
 script:
-    - ./tests/tests.sh
+    - make test

MANIFEST.in

@@ -3,4 +3,5 @@ include LICENSE
 include Makefile
 include README.rst
 include tests/*
+include tests/*/*
 exclude cdiff

Makefile

@@ -2,7 +2,7 @@
 
 TESTPYPI = http://testpypi.python.org/pypi
 
-.PHONY: dogfood test clean dist-test dist
+.PHONY: dogfood test clean build dist-test dist
 
 dogfood:
 	./cdiff.py -s
@@ -10,8 +10,7 @@ dogfood:
 	git diff | ./cdiff.py -s
 
 test:
-	PYTHON=python ./tests/tests.sh
-	PYTHON=python3 ./tests/tests.sh
+	tests/regression.sh
 
 clean:
 	rm -f cdiff MANIFEST

tests/tests.sh → tests/regression.sh

@@ -5,9 +5,6 @@ set -o errexit
 SELF_DIR=$(cd $(dirname $0) && pwd) || exit 1
 CDIFF=$SELF_DIR/../cdiff.py
 
-# Override this to test with python3
-PYTHON=${PYTHON:-python}
-
 function pass()
 {
     if [[ -t 1 ]]; then
@@ -33,8 +30,7 @@ function cmpOutput()
     local cdiff_opt=${3:-""}
 
     echo -n "Test option '$cdiff_opt' with input '$input' ... "
-    if $PYTHON $CDIFF $cdiff_opt $input | diff -ub $expected_out - >& /dev/null
-    then
+    if $CDIFF $cdiff_opt $input | diff -ubq $expected_out - >& /dev/null; then
         pass
         return 0
     else