Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
91d0ab9b
Commit
91d0ab9b
authored
Apr 17, 2014
by
Damien George
Browse files
Merge pull request #504 from lurch/patch-4
Allow the uPy used by run-tests to be overridden
parents
5f82b503
5709453c
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/run-tests
View file @
91d0ab9b
...
...
@@ -10,10 +10,10 @@ from glob import glob
# to the correct executable.
if
os
.
name
==
'nt'
:
CPYTHON3
=
os
.
getenv
(
'MICROPY_CPYTHON3'
,
'python3.exe'
)
M
P_PY
=
'../windows/micropython.exe'
M
ICROPYTHON
=
os
.
getenv
(
'MICROPY_MICROPYTHON'
,
'../windows/micropython.exe'
)
else
:
CPYTHON3
=
os
.
getenv
(
'MICROPY_CPYTHON3'
,
'python3'
)
M
P_PY
=
'../unix/micropython'
M
ICROPYTHON
=
os
.
getenv
(
'MICROPY_MICROPYTHON'
,
'../unix/micropython'
)
# Set of tests that we shouldn't run under Travis CI
skip_travis_tests
=
set
([
'basics/memoryerror.py'
])
...
...
@@ -40,7 +40,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
:
...
...
@@ -62,7 +62,7 @@ for test_file in tests:
output_mupy
=
b
'CRASH'
else
:
try
:
output_mupy
=
subprocess
.
check_output
([
M
P_PY
,
'-X'
,
'emit=bytecode'
,
test_file
])
output_mupy
=
subprocess
.
check_output
([
M
ICROPYTHON
,
'-X'
,
'emit=bytecode'
,
test_file
])
except
subprocess
.
CalledProcessError
:
output_mupy
=
b
'CRASH'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment