diff options
| author | Daniel Jour <d.jour@steiner.de> | 2022-08-02 23:48:41 +0200 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-08-11 13:31:13 +1000 |
| commit | 47c84286e8c8d9873e99f12711a683ecd6b9ca62 (patch) | |
| tree | d898345b0fc9bc59eb3011741dde15f124682a0b /tests | |
| parent | b2e82402688b53829f37475583231b067b9faea7 (diff) | |
all: Fix paths to mpy-cross and micropython binaries.
Binaries built using the Make build system now no longer appear in the
working directory of the build, but rather in the build directory. Thus
some paths had to be adjusted.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/run-natmodtests.py | 2 | ||||
| -rwxr-xr-x | tests/run-tests.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py index 8eb27169c..9130e00d6 100755 --- a/tests/run-natmodtests.py +++ b/tests/run-natmodtests.py @@ -14,7 +14,7 @@ import pyboard # Paths for host executables CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3") -MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython-coverage") +MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-coverage/micropython-coverage") NATMOD_EXAMPLE_DIR = "../examples/natmod/" diff --git a/tests/run-tests.py b/tests/run-tests.py index 2745ee139..8e9bd8431 100755 --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -33,14 +33,16 @@ if os.name == "nt": MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/windows/micropython.exe")) else: CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3") - MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/unix/micropython")) + MICROPYTHON = os.getenv( + "MICROPY_MICROPYTHON", base_path("../ports/unix/build-standard/micropython") + ) # Use CPython options to not save .pyc files, to only access the core standard library # (not site packages which may clash with u-module names), and improve start up time. CPYTHON3_CMD = [CPYTHON3, "-BS"] # mpy-cross is only needed if --via-mpy command-line arg is passed -MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/mpy-cross")) +MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/build/mpy-cross")) # For diff'ing test output DIFF = os.getenv("MICROPY_DIFF", "diff -u") |