summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-15 12:20:22 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-15 12:20:22 +0100
commit48aaa27c6a07af524ac6eaafac67815b5de13396 (patch)
treeedfb7eaacc6040aaf74e2983efe516f9316b6d15
parentfd1c7b9d48ef4a059d702667ff45aeb955c9e6f0 (diff)
downloadmicropython-48aaa27c6a07af524ac6eaafac67815b5de13396.tar.gz
micropython-48aaa27c6a07af524ac6eaafac67815b5de13396.zip
travis: Diff output, hopefully this works.
-rw-r--r--.travis.yml5
-rwxr-xr-xtests/run-tests2
2 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 7209e3638d..32250edf71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,4 @@ script:
- make -C unix-cpy CC=gcc-4.7
- make -C bare-arm
- make -C stmhal
- - cd tests && MICROPY_CPYTHON3=python3.3 ./run-tests
- - cat tests/memoryerror.py.exp
- - cat tests/memoryerror.py.out
- - cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff $testbase.exp $testbase.out; done
+ - (cd tests && MICROPY_CPYTHON3=python3.3 ./run-tests || for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff $testbase.exp $testbase.out; done && exit 1)
diff --git a/tests/run-tests b/tests/run-tests
index c95c302779..554f5134c5 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -70,8 +70,6 @@ for test_file in tests:
rm_f(os.path.basename(test_file + ".exp"))
rm_f(os.path.basename(test_file + ".out"))
else:
- print('EXP|{}|'.format(output_expected))
- print('OUT|{}|'.format(output_mupy))
with open(os.path.basename(test_file + ".exp"), "w") as f:
f.write(str(output_expected, "ascii"))
with open(os.path.basename(test_file + ".out"), "w") as f: