Commit 5709453c authored by Andrew Scheller's avatar Andrew Scheller
Browse files

Changed the envvar name to MICROPY_MICROPYTHON

As discussed in #504
parent 6ca17bcf
...@@ -10,10 +10,10 @@ from glob import glob ...@@ -10,10 +10,10 @@ from glob import glob
# to the correct executable. # to the correct executable.
if os.name == 'nt': if os.name == 'nt':
CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3.exe') CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3.exe')
MP_PY = os.getenv('MICROPY_MP_PY', '../windows/micropython.exe') MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', '../windows/micropython.exe')
else: else:
CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3') CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3')
MP_PY = os.getenv('MICROPY_MP_PY', '../unix/micropython') MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', '../unix/micropython')
# Set of tests that we shouldn't run under Travis CI # Set of tests that we shouldn't run under Travis CI
skip_travis_tests = set(['basics/memoryerror.py']) skip_travis_tests = set(['basics/memoryerror.py'])
...@@ -65,7 +65,7 @@ for test_file in tests: ...@@ -65,7 +65,7 @@ for test_file in tests:
output_mupy = b'CRASH\n' + output_mupy output_mupy = b'CRASH\n' + output_mupy
else: else:
try: try:
output_mupy = subprocess.check_output([MP_PY, '-X', 'emit=bytecode', test_file]) output_mupy = subprocess.check_output([MICROPYTHON, '-X', 'emit=bytecode', test_file])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
output_mupy = b'CRASH' output_mupy = b'CRASH'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment