tests,tools: Update path to unix micropython executable.
These were missed by 47c84286e8c8d9873e99f12711a683ecd6b9ca62 Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
parent
98bd7e33b3
commit
cbc9f944c4
@ -16,7 +16,7 @@ if os.name == "nt":
|
|||||||
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
|
||||||
else:
|
else:
|
||||||
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
||||||
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
|
||||||
|
|
||||||
|
|
||||||
def run_tests(pyb, test_dict):
|
def run_tests(pyb, test_dict):
|
||||||
|
@ -18,7 +18,7 @@ if os.name == "nt":
|
|||||||
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
|
||||||
else:
|
else:
|
||||||
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
||||||
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
|
||||||
|
|
||||||
# For diff'ing test output
|
# For diff'ing test output
|
||||||
DIFF = os.getenv("MICROPY_DIFF", "diff -u")
|
DIFF = os.getenv("MICROPY_DIFF", "diff -u")
|
||||||
|
@ -21,7 +21,7 @@ if os.name == "nt":
|
|||||||
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
|
||||||
else:
|
else:
|
||||||
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
||||||
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
|
||||||
|
|
||||||
PYTHON_TRUTH = CPYTHON3
|
PYTHON_TRUTH = CPYTHON3
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ AWK=awk
|
|||||||
MAKE="make -j2"
|
MAKE="make -j2"
|
||||||
|
|
||||||
# these are the binaries that are built; some have 2 or 3 depending on version
|
# these are the binaries that are built; some have 2 or 3 depending on version
|
||||||
bin_unix=ports/unix/micropython
|
bin_unix=ports/unix/build-standard/micropython
|
||||||
bin_stm32=ports/stm32/build-PYBV10/firmware.elf
|
bin_stm32=ports/stm32/build-PYBV10/firmware.elf
|
||||||
bin_barearm_1=ports/bare-arm/build/flash.elf
|
bin_barearm_1=ports/bare-arm/build/flash.elf
|
||||||
bin_barearm_2=ports/bare-arm/build/firmware.elf
|
bin_barearm_2=ports/bare-arm/build/firmware.elf
|
||||||
|
@ -42,7 +42,7 @@ if os.name == "nt":
|
|||||||
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
|
||||||
else:
|
else:
|
||||||
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
||||||
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
|
||||||
|
|
||||||
TESTPATH = "../tests/cpydiff/"
|
TESTPATH = "../tests/cpydiff/"
|
||||||
DOCPATH = "../docs/genrst/"
|
DOCPATH = "../docs/genrst/"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user