diff options
| author | Andrew Scheller <github@loowis.durge.org> | 2014-04-16 20:24:16 +0100 |
|---|---|---|
| committer | Andrew Scheller <github@loowis.durge.org> | 2014-04-16 20:24:16 +0100 |
| commit | c297ca33276275645f13b20994b7d445e7b272db (patch) | |
| tree | 0a4965cc5f5258f00ad87c118c6fcd264cae5c72 /tests | |
| parent | f6be480bda92486c3185ceaf8f25f461dfb2aa72 (diff) | |
| download | micropython-c297ca33276275645f13b20994b7d445e7b272db.tar.gz micropython-c297ca33276275645f13b20994b7d445e7b272db.zip | |
Allow the uPy used by run-tests to be overridden
with MICROPY_MP_PY envvar, in an analogous way to MICROPY_CPYTHON3 envvar.
(the reason for this will be made clearer by a later PR)
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/run-tests | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/run-tests b/tests/run-tests index bd6e50bbd2..49be9dae2b 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -10,10 +10,10 @@ from glob import glob # to the correct executable. if os.name == 'nt': CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3.exe') - MP_PY = '../windows/micropython.exe' + MP_PY = os.getenv('MICROPY_MP_PY', '../windows/micropython.exe') else: CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3') - MP_PY = '../unix/micropython' + MP_PY = ('MICROPY_MP_PY', '../unix/micropython') # Set of tests that we shouldn't run under Travis CI skip_travis_tests = set(['basics/memoryerror.py']) @@ -39,7 +39,7 @@ if test_on_pyboard: pyb = pyboard.Pyboard('/dev/ttyACM0') pyb.enter_raw_repl() -running_under_travis = os.environ.get('TRAVIS', 'false') == 'true' +running_under_travis = os.getenv('TRAVIS') == 'true' for test_file in tests: if running_under_travis and test_file in skip_travis_tests: |