From 43241ceaacce2de370a7dd676ac9cc7383e08c83 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 2 Jul 2016 15:26:07 +0300 Subject: [PATCH] unix: Enable btree module. But disable it for coverage build, as its extra warninsg aren't compatible with K&R C BerkeleyDB uses. --- unix/Makefile | 2 +- unix/mpconfigport.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/unix/Makefile b/unix/Makefile index 72f35c38cd..8eceaea637 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -260,7 +260,7 @@ freedos: # build an interpreter for coverage testing and do the testing coverage: - $(MAKE) COPT="-O0" CFLAGS_EXTRA='-DMP_CONFIGFILE="" -fprofile-arcs -ftest-coverage -Wdouble-promotion -Wformat -Wmissing-declarations -Wmissing-prototypes -Wold-style-definition -Wpointer-arith -Wshadow -Wsign-compare -Wuninitialized -Wunused-parameter -DMICROPY_UNIX_COVERAGE' LDFLAGS_EXTRA='-fprofile-arcs -ftest-coverage' BUILD=build-coverage PROG=micropython_coverage + $(MAKE) COPT="-O0" MICROPY_PY_BTREE=0 CFLAGS_EXTRA='-DMP_CONFIGFILE="" -fprofile-arcs -ftest-coverage -Wdouble-promotion -Wformat -Wmissing-declarations -Wmissing-prototypes -Wold-style-definition -Wpointer-arith -Wshadow -Wsign-compare -Wuninitialized -Wunused-parameter -DMICROPY_UNIX_COVERAGE' LDFLAGS_EXTRA='-fprofile-arcs -ftest-coverage' BUILD=build-coverage PROG=micropython_coverage coverage_test: coverage $(eval DIRNAME=$(notdir $(CURDIR))) diff --git a/unix/mpconfigport.mk b/unix/mpconfigport.mk index 4dc59f2fac..9f826661a9 100644 --- a/unix/mpconfigport.mk +++ b/unix/mpconfigport.mk @@ -11,6 +11,9 @@ MICROPY_USE_READLINE = 1 # Whether to enable FatFs VFS MICROPY_FATFS = 1 +# btree module using Berkeley DB 1.xx +MICROPY_PY_BTREE = 1 + # _thread module using pthreads MICROPY_PY_THREAD = 1