djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix/variants: Remove variant suffix from executable filename.

Browse Source 
The executable now lives in the build directory, and since the build
directory already contains the variant name there is no need to also add
it to the executable.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2022-08-11 12:40:23 +10:00
parent c7aa6a2c73
commit d53c3b6ade
12 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ports_unix.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
env: env:
SOURCE_DATE_EPOCH: 1234567890 SOURCE_DATE_EPOCH: 1234567890
- name: Check reproducible build date - name: Check reproducible build date
run: echo | ports/unix/build-minimal/micropython-minimal -i | grep 'on 2009-02-13;' run: echo | ports/unix/build-minimal/micropython -i | grep 'on 2009-02-13;'
standard: standard:
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
ports/unix/variants/coverage/mpconfigvariant.mk
View File

@ -1,5 +1,3 @@
PROG ?= micropython-coverage
# Disable optimisations and enable assert() on coverage builds. # Disable optimisations and enable assert() on coverage builds.
DEBUG ?= 1 DEBUG ?= 1

2
ports/unix/variants/dev/mpconfigvariant.mk
View File

@ -1,5 +1,3 @@
PROG ?= micropython-dev
FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
MICROPY_ROM_TEXT_COMPRESSION = 1 MICROPY_ROM_TEXT_COMPRESSION = 1

2
ports/unix/variants/fast/mpconfigvariant.mk
View File

@ -2,6 +2,4 @@
COPT += -fno-crossjumping -O2 COPT += -fno-crossjumping -O2
PROG = micropython-fast
FROZEN_MANIFEST = FROZEN_MANIFEST =

2
ports/unix/variants/freedos/mpconfigvariant.mk
View File

@ -10,8 +10,6 @@ CFLAGS += \
-DMICROPY_EMIT_X86=0 \ -DMICROPY_EMIT_X86=0 \
-DMICROPY_NO_ALLOCA=1 \ -DMICROPY_NO_ALLOCA=1 \
PROG = micropython-freedos
MICROPY_PY_SOCKET = 0 MICROPY_PY_SOCKET = 0
MICROPY_PY_FFI = 0 MICROPY_PY_FFI = 0
MICROPY_PY_JNI = 0 MICROPY_PY_JNI = 0

1
ports/unix/variants/minimal/mpconfigvariant.mk
View File

@ -1,5 +1,4 @@
# build a minimal interpreter # build a minimal interpreter
PROG = micropython-minimal
FROZEN_MANIFEST = FROZEN_MANIFEST =

1
ports/unix/variants/nanbox/mpconfigvariant.mk
View File

@ -1,4 +1,3 @@
# build interpreter with nan-boxing as object model (object repr D) # build interpreter with nan-boxing as object model (object repr D)
PROG = micropython-nanbox
MICROPY_FORCE_32BIT = 1 MICROPY_FORCE_32BIT = 1

2
ports/unix/variants/standard/mpconfigvariant.mk
View File

@ -1,3 +1 @@
# This is the default variant when you `make` the Unix port. # This is the default variant when you `make` the Unix port.
PROG ?= micropython

2
ports/windows/variants/dev/mpconfigvariant.mk
View File

@ -1,5 +1,3 @@
PROG ?= micropython-dev
FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
MICROPY_ROM_TEXT_COMPRESSION = 1 MICROPY_ROM_TEXT_COMPRESSION = 1

2
tests/run-natmodtests.py
View File

@ -14,7 +14,7 @@ import pyboard
# Paths for host executables # Paths for host executables
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3") CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-coverage/micropython-coverage") MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-coverage/micropython")
NATMOD_EXAMPLE_DIR = "../examples/natmod/" NATMOD_EXAMPLE_DIR = "../examples/natmod/"

26
tools/ci.sh
View File

@ -410,14 +410,10 @@ function ci_unix_run_tests_helper {
function ci_unix_run_tests_full_helper { function ci_unix_run_tests_full_helper {
variant=$1 variant=$1
shift shift
if [ $variant = standard ]; then micropython=../ports/unix/build-$variant/micropython
micropython=build-$variant/micropython
else
micropython=build-$variant/micropython-$variant
fi
make -C ports/unix VARIANT=$variant "$@" test_full make -C ports/unix VARIANT=$variant "$@" test_full
(cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-multitests.py multi_net/*.py) (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=$micropython ./run-multitests.py multi_net/*.py)
(cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-perfbench.py 1000 1000) (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=$micropython ./run-perfbench.py 1000 1000)
} }
function ci_native_mpy_modules_build { function ci_native_mpy_modules_build {
@ -446,7 +442,7 @@ function ci_unix_minimal_build {
} }
function ci_unix_minimal_run_tests { function ci_unix_minimal_run_tests {
(cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/build-minimal/micropython-minimal ./run-tests.py -e exception_chain -e self_type_check -e subclass_native_init -d basics) (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/build-minimal/micropython ./run-tests.py -e exception_chain -e self_type_check -e subclass_native_init -d basics)
} }
function ci_unix_standard_build { function ci_unix_standard_build {
@ -494,20 +490,20 @@ function ci_unix_coverage_run_mpy_merge_tests {
echo $test echo $test
outmpy=$outdir/$test.mpy outmpy=$outdir/$test.mpy
$mptop/mpy-cross/build/mpy-cross -o $outmpy $inpy $mptop/mpy-cross/build/mpy-cross -o $outmpy $inpy
(cd $outdir && $mptop/ports/unix/build-coverage/micropython-coverage -m $test >> out-individual) (cd $outdir && $mptop/ports/unix/build-coverage/micropython -m $test >> out-individual)
allmpy+=($outmpy) allmpy+=($outmpy)
done done
# Merge all the tests into one .mpy file, and then execute it. # Merge all the tests into one .mpy file, and then execute it.
python3 $mptop/tools/mpy-tool.py --merge -o $outdir/merged.mpy ${allmpy[@]} python3 $mptop/tools/mpy-tool.py --merge -o $outdir/merged.mpy ${allmpy[@]}
(cd $outdir && $mptop/ports/unix/build-coverage/micropython-coverage -m merged > out-merged) (cd $outdir && $mptop/ports/unix/build-coverage/micropython -m merged > out-merged)
# Make sure the outputs match. # Make sure the outputs match.
diff $outdir/out-individual $outdir/out-merged && /bin/rm -rf $outdir diff $outdir/out-individual $outdir/out-merged && /bin/rm -rf $outdir
} }
function ci_unix_coverage_run_native_mpy_tests { function ci_unix_coverage_run_native_mpy_tests {
MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython-coverage -m features2 MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython -m features2
(cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,urandom*,ure*,uzlib*}.py) (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,urandom*,ure*,uzlib*}.py)
} }
@ -635,8 +631,8 @@ function ci_unix_qemu_mips_run_tests {
# Issues with MIPS tests: # Issues with MIPS tests:
# - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call) # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
# - ffi tests do not work # - ffi tests do not work
file ./ports/unix/micropython-coverage file ./ports/unix/build-coverage/micropython
(cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py') (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
} }
function ci_unix_qemu_arm_setup { function ci_unix_qemu_arm_setup {
@ -655,8 +651,8 @@ function ci_unix_qemu_arm_run_tests {
# Issues with ARM tests: # Issues with ARM tests:
# - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call) # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
file ./ports/unix/micropython-coverage file ./ports/unix/build-coverage/micropython
(cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py') (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.py')
} }
######################################################################################## ########################################################################################

4
tools/metrics.py
View File

@ -60,8 +60,8 @@ class PortData:
port_data = { port_data = {
"b": PortData("bare-arm", "bare-arm", "build/firmware.elf"), "b": PortData("bare-arm", "bare-arm", "build/firmware.elf"),
"m": PortData("minimal x86", "minimal", "build/firmware.elf"), "m": PortData("minimal x86", "minimal", "build/firmware.elf"),
"u": PortData("unix x64", "unix", "micropython"), "u": PortData("unix x64", "unix", "build-standard/micropython"),
"n": PortData("unix nanbox", "unix", "micropython-nanbox", "VARIANT=nanbox"), "n": PortData("unix nanbox", "unix", "build-nanbox/micropython", "VARIANT=nanbox"),
"s": PortData("stm32", "stm32", "build-PYBV10/firmware.elf", "BOARD=PYBV10"), "s": PortData("stm32", "stm32", "build-PYBV10/firmware.elf", "BOARD=PYBV10"),
"c": PortData("cc3200", "cc3200", "build/WIPY/release/application.axf", "BTARGET=application"), "c": PortData("cc3200", "cc3200", "build/WIPY/release/application.axf", "BTARGET=application"),
"8": PortData("esp8266", "esp8266", "build-GENERIC/firmware.elf"), "8": PortData("esp8266", "esp8266", "build-GENERIC/firmware.elf"),