diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-02 15:31:39 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-02 15:31:39 +0100 |
commit | 929a675a3d2d37fb8c6acbec1b999b9bdd84ff23 (patch) | |
tree | d9abf7e2e3d05deaf730a2713cfef037f337ed56 | |
parent | 4d4a7f535495d8fd523f826218e239a74db86d97 (diff) | |
download | micropython-929a675a3d2d37fb8c6acbec1b999b9bdd84ff23.tar.gz micropython-929a675a3d2d37fb8c6acbec1b999b9bdd84ff23.zip |
Change test scripts to use python3; bytecode tests use python3.4.
I upgraded to Python 3.4.0, so needed to make these changes. Hopefully
the tests still run with Python 3.3.x (the scripts use python3 so are
agnostic as to the subversion).
Bytecode tests are tightly coupled to the Python version, and now some
fail against Python 3.4.
-rwxr-xr-x | tests/bytecode/run-tests | 6 | ||||
-rwxr-xr-x | tests/run-tests | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/bytecode/run-tests b/tests/bytecode/run-tests index 36fac03249..06878fe61e 100755 --- a/tests/bytecode/run-tests +++ b/tests/bytecode/run-tests @@ -1,6 +1,6 @@ #!/usr/bin/env bash -CPYTHON3=python3.3 +CPYTHON3=python3.4 MP_CPY=../../unix-cpy/cpy RM=/bin/rm @@ -17,8 +17,8 @@ function run_test_on_dir() { basename=$(basename $file .py) $CPYTHON3 -B -c "import compileall; compileall.compile_file('$file', quiet=True)" - #/usr/lib/python3.3/compileall.py $file - $CPYTHON3 -B unpyc.py $1/__pycache__/$basename.cpython-33.pyc > output/$basename.pycout + #/usr/lib/python3.4/compileall.py $file + $CPYTHON3 -B unpyc.py $1/__pycache__/$basename.cpython-34.pyc > output/$basename.pycout $MP_CPY $file | $CPYTHON3 -B check.py output/$basename.pycout done diff --git a/tests/run-tests b/tests/run-tests index 134ed52617..834f1f9309 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -1,4 +1,4 @@ -#! /usr/bin/env python3.3 +#! /usr/bin/env python3 import os import subprocess @@ -6,10 +6,10 @@ import sys from glob import glob if os.name == 'nt': - CPYTHON3 = 'python3.3.exe' + CPYTHON3 = 'python3.exe' MP_PY = '../windows/micropython.exe' else: - CPYTHON3 = 'python3.3' + CPYTHON3 = 'python3' MP_PY = '../unix/micropython' def rm_f(fname): |