diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2020-06-09 16:45:17 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2020-07-01 22:42:55 +1000 |
| commit | 27abac95d87b69f4282e2ca21ab19eff7bf6012b (patch) | |
| tree | 0cdd7d3917fd78a6a69fc491b49a2a6b0cb1f973 /ports/unix/variants/coverage | |
| parent | 07f181a216dc2fe323f0511cf3a5f9dc37545c22 (diff) | |
| download | micropython-27abac95d87b69f4282e2ca21ab19eff7bf6012b.tar.gz micropython-27abac95d87b69f4282e2ca21ab19eff7bf6012b.zip | |
unix: Make manifest selection match other ports.
Changes are:
- The default manifest.py is moved to the variants directory (it's in
"boards" in other ports).
- The coverage variant now uses a custom manifest in its variant directory
to add frzmpy/frzstr.
- The frzmpy/frzstr tests are moved to variants/coverage/.
Diffstat (limited to 'ports/unix/variants/coverage')
10 files changed, 23 insertions, 1 deletions
diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy1.py b/ports/unix/variants/coverage/frzmpy/frzmpy1.py new file mode 100644 index 0000000000..8ad0f15730 --- /dev/null +++ b/ports/unix/variants/coverage/frzmpy/frzmpy1.py @@ -0,0 +1 @@ +print('frzmpy1') diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy2.py b/ports/unix/variants/coverage/frzmpy/frzmpy2.py new file mode 100644 index 0000000000..1ad930db2b --- /dev/null +++ b/ports/unix/variants/coverage/frzmpy/frzmpy2.py @@ -0,0 +1 @@ +raise ZeroDivisionError diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py new file mode 100644 index 0000000000..8c023afeba --- /dev/null +++ b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py @@ -0,0 +1,3 @@ +# test frozen package with __init__.py +print('frzmpy_pkg1.__init__') +x = 1 diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py new file mode 100644 index 0000000000..a66b505bf6 --- /dev/null +++ b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py @@ -0,0 +1,4 @@ +# test frozen package without __init__.py +print('frzmpy_pkg2.mod') +class Foo: + x = 1 diff --git a/ports/unix/variants/coverage/frzmpy/frzqstr.py b/ports/unix/variants/coverage/frzmpy/frzqstr.py new file mode 100644 index 0000000000..051f2a9c16 --- /dev/null +++ b/ports/unix/variants/coverage/frzmpy/frzqstr.py @@ -0,0 +1,3 @@ +# Checks for regression on MP_QSTR_NULL +def returns_NULL(): + return "NULL" diff --git a/ports/unix/variants/coverage/frzstr/frzstr1.py b/ports/unix/variants/coverage/frzstr/frzstr1.py new file mode 100644 index 0000000000..6e88ac38d2 --- /dev/null +++ b/ports/unix/variants/coverage/frzstr/frzstr1.py @@ -0,0 +1 @@ +print('frzstr1') diff --git a/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py new file mode 100644 index 0000000000..1d1df9417e --- /dev/null +++ b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py @@ -0,0 +1,3 @@ +# test frozen package with __init__.py +print('frzstr_pkg1.__init__') +x = 1 diff --git a/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py new file mode 100644 index 0000000000..bafb5978b0 --- /dev/null +++ b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py @@ -0,0 +1,4 @@ +# test frozen package without __init__.py +print('frzstr_pkg2.mod') +class Foo: + x = 1 diff --git a/ports/unix/variants/coverage/manifest.py b/ports/unix/variants/coverage/manifest.py new file mode 100644 index 0000000000..6111050884 --- /dev/null +++ b/ports/unix/variants/coverage/manifest.py @@ -0,0 +1,2 @@ +freeze_as_str("frzstr") +freeze_as_mpy("frzmpy") diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk index ddb5027a97..66e694e0a9 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.mk +++ b/ports/unix/variants/coverage/mpconfigvariant.mk @@ -11,7 +11,7 @@ CFLAGS += \ LDFLAGS += -fprofile-arcs -ftest-coverage -FROZEN_MANIFEST = manifest_coverage.py +FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py MICROPY_ROM_TEXT_COMPRESSION = 1 MICROPY_VFS_FAT = 1 |