summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml32
-rw-r--r--ports/unix/.gitignore7
-rw-r--r--ports/unix/variants/coverage/mpconfigvariant.mk2
-rw-r--r--ports/unix/variants/dev/mpconfigvariant.mk2
-rw-r--r--ports/unix/variants/fast/mpconfigvariant.mk2
-rw-r--r--ports/unix/variants/freedos/mpconfigvariant.mk2
-rw-r--r--ports/unix/variants/minimal/mpconfigvariant.mk2
-rw-r--r--ports/unix/variants/nanbox/mpconfigvariant.mk2
-rwxr-xr-xtests/run-natmodtests.py2
9 files changed, 24 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml
index 55c07bec2..9e88ecd8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,13 +75,13 @@ jobs:
- make ${MAKEOPTS} -C ports/unix deplibs
- make ${MAKEOPTS} -C ports/unix VARIANT=coverage
# run the main test suite
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float micropython)
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native -d basics float micropython)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests -d thread)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --emit native)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --via-mpy -d basics float micropython)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --via-mpy --emit native -d basics float micropython)
# test when input script comes from stdin
- - cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
+ - cat tests/basics/0prelim.py | ports/unix/micropython-coverage | grep -q 'abc'
# test building native mpy modules
- make -C examples/natmod/features1 ARCH=x64
- make -C examples/natmod/features2 ARCH=x64
@@ -92,7 +92,7 @@ jobs:
- make -C examples/natmod/ure ARCH=x64
- make -C examples/natmod/uzlib ARCH=x64
# test importing .mpy generated by mpy_ld.py
- - MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython_coverage -m features2
+ - MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
- (cd tests && ./run-natmodtests.py extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py)
# run coveralls coverage analysis (try to, even if some builds/tests failed)
- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
@@ -115,13 +115,13 @@ jobs:
- make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 deplibs
- make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 coverage
# run the main test suite
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --mpy-cross-flags='-mcache-lookup-bc -march=x86' -d basics float micropython)
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native --mpy-cross-flags='-mcache-lookup-bc -march=x86' -d basics float micropython)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests -d thread)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --emit native)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --via-mpy --mpy-cross-flags='-mcache-lookup-bc -march=x86' -d basics float micropython)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --via-mpy --emit native --mpy-cross-flags='-mcache-lookup-bc -march=x86' -d basics float micropython)
# test when input script comes from stdin
- - cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
+ - cat tests/basics/0prelim.py | ports/unix/micropython-coverage | grep -q 'abc'
# test building native mpy modules
- make -C examples/natmod/features1 ARCH=x86
- make -C examples/natmod/features2 ARCH=x86
@@ -132,7 +132,7 @@ jobs:
- make -C examples/natmod/ure ARCH=x86
- make -C examples/natmod/uzlib ARCH=x86
# test importing .mpy generated by mpy_ld.py
- - MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython_coverage -m features2
+ - MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
- (cd tests && ./run-natmodtests.py --arch x86 extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py)
after_failure:
- (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)
@@ -158,7 +158,7 @@ jobs:
- make ${MAKEOPTS} -C ports/unix submodules
- make ${MAKEOPTS} -C ports/unix PYTHON=python2 deplibs
- make ${MAKEOPTS} -C ports/unix PYTHON=python2 VARIANT=nanbox
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_nanbox ./run-tests)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-nanbox ./run-tests)
# unix stackless
- stage: test
@@ -187,7 +187,7 @@ jobs:
env: NAME="minimal unix port build and tests"
script:
- make ${MAKEOPTS} -C ports/unix minimal
- - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
+ - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
# windows port via mingw
- stage: test
diff --git a/ports/unix/.gitignore b/ports/unix/.gitignore
index 977690827..674521868 100644
--- a/ports/unix/.gitignore
+++ b/ports/unix/.gitignore
@@ -1,9 +1,4 @@
micropython
-micropython_dev
-micropython_fast
-micropython_minimal
-micropython_coverage
-micropython_nanbox
-micropython_freedos*
+micropython-*
*.py
*.gcov
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index e55b22eb9..077e7e11a 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -1,4 +1,4 @@
-PROG ?= micropython_coverage
+PROG ?= micropython-coverage
COPT = -O0
diff --git a/ports/unix/variants/dev/mpconfigvariant.mk b/ports/unix/variants/dev/mpconfigvariant.mk
index 3b0f2d896..751a748f6 100644
--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ b/ports/unix/variants/dev/mpconfigvariant.mk
@@ -1 +1 @@
-PROG ?= micropython_dev
+PROG ?= micropython-dev
diff --git a/ports/unix/variants/fast/mpconfigvariant.mk b/ports/unix/variants/fast/mpconfigvariant.mk
index 60c1d525d..e6022291d 100644
--- a/ports/unix/variants/fast/mpconfigvariant.mk
+++ b/ports/unix/variants/fast/mpconfigvariant.mk
@@ -2,6 +2,6 @@
COPT = "-O2 -DNDEBUG -fno-crossjumping"
-PROG = micropython_fast
+PROG = micropython-fast
FROZEN_MANIFEST =
diff --git a/ports/unix/variants/freedos/mpconfigvariant.mk b/ports/unix/variants/freedos/mpconfigvariant.mk
index f1d0ac21b..f7e5ed516 100644
--- a/ports/unix/variants/freedos/mpconfigvariant.mk
+++ b/ports/unix/variants/freedos/mpconfigvariant.mk
@@ -10,7 +10,7 @@ CFLAGS_EXTRA = \
-DMICROPY_EMIT_X86=0 \
-DMICROPY_NO_ALLOCA=1 \
-PROG = micropython_freedos
+PROG = micropython-freedos
MICROPY_PY_SOCKET = 0
MICROPY_PY_FFI = 0
diff --git a/ports/unix/variants/minimal/mpconfigvariant.mk b/ports/unix/variants/minimal/mpconfigvariant.mk
index 19f8ad64a..58ee64f83 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.mk
+++ b/ports/unix/variants/minimal/mpconfigvariant.mk
@@ -1,7 +1,7 @@
# build a minimal interpreter
COPT = -Os -DNDEBUG
-PROG = micropython_minimal
+PROG = micropython-minimal
FROZEN_MANIFEST =
diff --git a/ports/unix/variants/nanbox/mpconfigvariant.mk b/ports/unix/variants/nanbox/mpconfigvariant.mk
index b7b485b51..9752b922c 100644
--- a/ports/unix/variants/nanbox/mpconfigvariant.mk
+++ b/ports/unix/variants/nanbox/mpconfigvariant.mk
@@ -1,4 +1,4 @@
# build interpreter with nan-boxing as object model (object repr D)
-PROG = micropython_nanbox
+PROG = micropython-nanbox
MICROPY_FORCE_32BIT = 1
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 3f49a1d68..46f21f81d 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/micropython-coverage')
NATMOD_EXAMPLE_DIR = '../examples/natmod/'
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-30 12:21:33 +0000