unix/variants: Remove variant suffix from executable filename.

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>
2022-08-11 12:40:23 +10:00 · 2022-08-11 12:40:23 +10:00 · d53c3b6ade
commit d53c3b6ade
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@ -35,7 +35,7 @@ jobs:
      env:
        SOURCE_DATE_EPOCH: 1234567890
    - 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:
    runs-on: ubuntu-latest
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@ -1,5 +1,3 @@
-PROG ?= micropython-coverage
-
 # Disable optimisations and enable assert() on coverage builds.
 DEBUG ?= 1

--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ b/ports/unix/variants/dev/mpconfigvariant.mk
@ -1,5 +1,3 @@
-PROG ?= micropython-dev
-
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py

 MICROPY_ROM_TEXT_COMPRESSION = 1
--- a/ports/unix/variants/fast/mpconfigvariant.mk
+++ b/ports/unix/variants/fast/mpconfigvariant.mk
@ -2,6 +2,4 @@

 COPT += -fno-crossjumping -O2

-PROG = micropython-fast
-
 FROZEN_MANIFEST =
--- a/ports/unix/variants/freedos/mpconfigvariant.mk
+++ b/ports/unix/variants/freedos/mpconfigvariant.mk
@ -10,8 +10,6 @@ CFLAGS += \
 	-DMICROPY_EMIT_X86=0 \
 	-DMICROPY_NO_ALLOCA=1 \

-PROG = micropython-freedos
-
 MICROPY_PY_SOCKET = 0
 MICROPY_PY_FFI = 0
 MICROPY_PY_JNI = 0
--- a/ports/unix/variants/minimal/mpconfigvariant.mk
+++ b/ports/unix/variants/minimal/mpconfigvariant.mk
@ -1,5 +1,4 @@
 # build a minimal interpreter
-PROG = micropython-minimal

 FROZEN_MANIFEST =

--- a/ports/unix/variants/nanbox/mpconfigvariant.mk
+++ b/ports/unix/variants/nanbox/mpconfigvariant.mk
@ -1,4 +1,3 @@
 # build interpreter with nan-boxing as object model (object repr D)
-PROG = micropython-nanbox

 MICROPY_FORCE_32BIT = 1
--- a/ports/unix/variants/standard/mpconfigvariant.mk
+++ b/ports/unix/variants/standard/mpconfigvariant.mk
@ -1,3 +1 @@
 # This is the default variant when you `make` the Unix port.
-
-PROG ?= micropython
--- a/ports/windows/variants/dev/mpconfigvariant.mk
+++ b/ports/windows/variants/dev/mpconfigvariant.mk
@ -1,5 +1,3 @@
-PROG ?= micropython-dev
-
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py

 MICROPY_ROM_TEXT_COMPRESSION = 1
--- 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/build-coverage/micropython-coverage")
+MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-coverage/micropython")

 NATMOD_EXAMPLE_DIR = "../examples/natmod/"

--- a/tools/ci.sh
+++ b/tools/ci.sh
@ -410,14 +410,10 @@ function ci_unix_run_tests_helper {
 function ci_unix_run_tests_full_helper {
    variant=$1
    shift
-    if [ $variant = standard ]; then
-        micropython=build-$variant/micropython
-    else
-        micropython=build-$variant/micropython-$variant
-    fi
+    micropython=../ports/unix/build-$variant/micropython
    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=../ports/unix/$micropython ./run-perfbench.py 1000 1000)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=$micropython ./run-multitests.py multi_net/*.py)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=$micropython ./run-perfbench.py 1000 1000)
 }

 function ci_native_mpy_modules_build {
@ -446,7 +442,7 @@ function ci_unix_minimal_build {
 }

 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 {
@ -494,20 +490,20 @@ function ci_unix_coverage_run_mpy_merge_tests {
        echo $test
        outmpy=$outdir/$test.mpy
        $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)
    done

    # Merge all the tests into one .mpy file, and then execute it.
    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.
    diff $outdir/out-individual $outdir/out-merged && /bin/rm -rf $outdir
 }

 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)
 }

@ -635,8 +631,8 @@ function ci_unix_qemu_mips_run_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)
    # - ffi tests do not work
-    file ./ports/unix/micropython-coverage
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
+    file ./ports/unix/build-coverage/micropython
+    (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 {
@ -655,8 +651,8 @@ function ci_unix_qemu_arm_run_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)
    export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
-    file ./ports/unix/micropython-coverage
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py')
+    file ./ports/unix/build-coverage/micropython
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.py')
 }

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