Skip to content

Commit

Permalink
unix/Makefile: Remove old variant targets that are no longer needed.
Browse files Browse the repository at this point in the history
To eliminate confusion about what targets to use when building.
  • Loading branch information
dpgeorge committed Feb 15, 2020
1 parent be92aac commit baf11f2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -113,7 +113,7 @@ jobs:
- make ${MAKEOPTS} -C mpy-cross
- 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 coverage
- make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 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)
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
- stage: test
env: NAME="minimal unix port build and tests"
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)

# windows port via mingw
Expand Down
18 changes: 0 additions & 18 deletions ports/unix/Makefile
Expand Up @@ -221,24 +221,6 @@ test_gcov: test_full
gcov -o $(BUILD)/py $(TOP)/py/*.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).
# Deduce it from CROSS_COMPILE by default, but can be overridden.
ifneq ($(CROSS_COMPILE),)
Expand Down

0 comments on commit baf11f2

Please sign in to comment.