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

unix/Makefile: Remove old variant targets that are no longer needed.

Browse Source 
To eliminate confusion about what targets to use when building.
This commit is contained in:
Damien George 2020-02-11 13:29:25 +11:00
parent be92aacba3
commit baf11f237b
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -113,7 +113,7 @@ jobs:
- make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C mpy-cross
- make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 submodules - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 submodules
- make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 deplibs - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 deplibs
- make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 coverage - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 VARIANT=coverage
# run the main test suite # 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)
- (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 -d thread)
@ -186,7 +186,7 @@ jobs:
- stage: test - stage: test
env: NAME="minimal unix port build and tests" env: NAME="minimal unix port build and tests"
script: script:
- make ${MAKEOPTS} -C ports/unix minimal - make ${MAKEOPTS} -C ports/unix VARIANT=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 # windows port via mingw

18
ports/unix/Makefile
View File

@ -221,24 +221,6 @@ test_gcov: test_full
gcov -o $(BUILD)/py $(TOP)/py/*.c gcov -o $(BUILD)/py $(TOP)/py/*.c
gcov -o $(BUILD)/extmod $(TOP)/extmod/*.c gcov -o $(BUILD)/extmod $(TOP)/extmod/*.c
# Maintain historical targets from pre-variant configurations.
fast:
$(MAKE) VARIANT=fast
minimal:
$(MAKE) VARIANT=minimal
nanbox:
$(MAKE) VARIANT=nanbox
freedos:
$(MAKE) VARIANT=freedos
coverage:
$(MAKE) VARIANT=coverage
coverage_test:
$(MAKE) VARIANT=coverage test_gcov
# Value of configure's --host= option (required for cross-compilation). # Value of configure's --host= option (required for cross-compilation).
# Deduce it from CROSS_COMPILE by default, but can be overridden. # Deduce it from CROSS_COMPILE by default, but can be overridden.
ifneq ($(CROSS_COMPILE),) ifneq ($(CROSS_COMPILE),)