diff options
| author | Scott Shawcroft <scott.shawcroft@gmail.com> | 2017-07-03 15:05:08 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@chickadee.tech> | 2017-08-11 17:16:13 -0700 |
| commit | fab634e3eeb456e9d5dffa2cabb9ded39c45d6b6 (patch) | |
| tree | 4f1926142546130d7bd0388303ebe0cd2ab1181c /py | |
| parent | f6a702538a0b3dd72879d65e3acc32520d4371f5 (diff) | |
Turn on Rosie CI testing to test new builds on real hardware.
This introduces a skip_if module that can be used by tests to
determine when they should be skipped due to the environment.
Some tests have been split in order to have finer grained skip
control.
Diffstat (limited to 'py')
| -rw-r--r-- | py/builtinimport.c | 2 | ||||
| -rw-r--r-- | py/frozenmod.c | 1 | ||||
| -rw-r--r-- | py/mkrules.mk | 1 | ||||
| -rw-r--r-- | py/mpconfig.h | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/py/builtinimport.c b/py/builtinimport.c index 01dddd02b..fc73567cd 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -115,6 +115,7 @@ STATIC mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *d vstr_reset(dest); size_t p_len; const char *p = mp_obj_str_get_data(path_items[i], &p_len); + DEBUG_printf("Looking in path: %d =%s=\n", i, p); if (p_len > 0) { vstr_add_strn(dest, p, p_len); vstr_add_char(dest, PATH_SEP_CHAR); @@ -386,6 +387,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) { mp_import_stat_t stat; if (vstr_len(&path) == 0) { // first module in the dotted-name; search for a directory or file + DEBUG_printf("Find file =%.*s=\n", vstr_len(&path), vstr_str(&path)); stat = find_file(mod_str, i, &path); } else { // latter module in the dotted-name; append to path diff --git a/py/frozenmod.c b/py/frozenmod.c index 782b437af..5a099ac96 100644 --- a/py/frozenmod.c +++ b/py/frozenmod.c @@ -72,7 +72,6 @@ STATIC mp_lexer_t *mp_lexer_frozen_str(const char *str, size_t str_len) { mp_lexer_t *lex = MICROPY_MODULE_FROZEN_LEXER(source, content, file_len, 0); return lex; } - #endif #if MICROPY_MODULE_FROZEN_MPY diff --git a/py/mkrules.mk b/py/mkrules.mk index 6b9f642f0..d61e1dda0 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -107,6 +107,7 @@ $(TOP)/mpy-cross/mpy-cross: $(TOP)/py/*.[ch] $(TOP)/mpy-cross/*.[ch] $(TOP)/wind $(Q)$(MAKE) -C $(TOP)/mpy-cross # make a list of all the .py files that need compiling and freezing +BLAH := $(info $(shell pwd)) FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py' | $(SED) -e 's=^$(FROZEN_MPY_DIR)/==') FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/frozen_mpy/,$(FROZEN_MPY_PY_FILES:.py=.mpy)) diff --git a/py/mpconfig.h b/py/mpconfig.h index 14c5af3e7..6cbadb623 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -40,7 +40,7 @@ // to another, you must rebuild from scratch using "-B" switch to make. #ifdef MP_CONFIGFILE -#include MP_CONFIGFILE +#include "mpconfigport_coverage.h" #else #include <mpconfigport.h> #endif |