Skip to content

Allow the uPy used by run-tests to be overridden #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 17, 2014
Merged

Allow the uPy used by run-tests to be overridden #504

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c297ca3
Allow the uPy used by run-tests to be overridden
lurch Apr 16, 2014
6ca17bc
Stupid typo
lurch Apr 16, 2014
5709453
Changed the envvar name to MICROPY_MICROPYTHON
lurch Apr 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/run-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', '../windows/micropython.exe')
else:
CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3')
MP_PY = '../unix/micropython'
MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', '../unix/micropython')

# Set of tests that we shouldn't run under Travis CI
skip_travis_tests = set(['basics/memoryerror.py'])
Expand All @@ -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:
Expand All @@ -65,7 +65,7 @@ for test_file in tests:
output_mupy = b'CRASH\n' + output_mupy
else:
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:
output_mupy = b'CRASH'

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy