* Move to PROGMEM aware libc, allow PSTR in printf() A Newlib (libc) patch is in progress to move the _P functions from inside Arduino into first-class citizens in libc. This Arduino patch cleans up code that's been migrated there. Binaries for the new libs are included because it seems they're part of the Arduino git tree, and should be replaced with @igrr built ones when/if the Newlib changes are accepted. Notable changes/additions for Arduino: Allow for use of PROGMEM based format and parameter strings in all *printf functions. No need for copying PSTR()s into RAM before printing them out (transparently saves heap space when using _P functions) and makes it easier to print out constant strings for applications. Add "%S" (capital-S) format that I've been told, but cannot verify, is used in Arduino to specify a PROGMEM string parameter in printfs, as an alias for "%s" since plain "%s" can now handle PROGMEM. Optimized the memcpy_P, strnlen_P, and strncpy_P functions to use 32-bit direct reads whenver possible (source and dest alignment mediated), but there is still room for improvement in others. Finally, move several constant arrays from RODATA into PROGMEM and update their accessors. Among these are the ctype array, ~260 bytes, mprec* arrays, ~300 bytes, and strings/daycounts in the time formatting functions, ~200 bytes. All told, sketches will see from 300 to 800 additional RAM heap free on startup (depending on their use of these routines). * Fix merge error in #ifdef/#endif * Fix host test using the newlib generic pgmspace.h Host tests now use the sys/pgmspace.h for compiles instead of the ESP8266-specific version. * Update with rebuilt libraries using latest newlib * Include binaries built directly from @igrr repo Rebuild the binaries using a git clone of https://github.com/igrr/newlib-xtensa Build commands for posterity: ```` rm -rf ./xtensa-lx106-elf/ ./configure --prefix=<DIR>/esp8266/tools/sdk/libc --with-newlib \ --enable-multilib --disable-newlib-io-c99-formats \ --disable-newlib-supplied-syscalls \ --enable-newlib-nano-formatted-io --enable-newlib-reent-small \ --enable-target-optspace \ --program-transform-name="s&^&xtensa-lx106-elf-&" \ --disable-option-checking --with-target-subdir=xtensa-lx106-elf \ --target=xtensa-lx106-elf rm -f etc/config.cache CROSS_CFLAGS="-fno-omit-frame-pointer -DSIGNAL_PROVIDED -DABORT_PROVIDED"\ " -DMALLOC_PROVIDED" \ PATH=<DIR>/esp8266/tools/xtensa-lx106-elf/bin/:$PATH \ make all install ```` * Fix merge define conflict in c_types.h * Fix strlen_P misaligned source error Include fix from newlib-xtensa/fix-strlen branch cleaning up misaligned access on a non-aligned source string. * Fix strlen_P and strcpy_P edge cases Ran the included test suite on ESP8266 tstring.c with the following defines: #define MAX_1 50 #define memcmp memcmp_P #define memcpy memcpy_P #define memmem memmem_P #define memchr memchr_P #define strcat strcat_P #define strncat strncat_P #define strcpy strcpy_P #define strlen strlen_P #define strnlen strnlen_P #define strcmp strcmp_P #define strncmp strncmp_P Uncovered edge case and return value problems in the optimized versions of the strnlen_P and strncpy_P functions. Corrected. * Fix memcpy_P return value memcpy-1.c test suite showed error in return value of memcpy_P. Correct it. * Fix strnlen_P/strlen_P off-by-4 error Random crashes, often on String constructors using a PSTR, would occur due to the accelerated strnlen_P going past the end of the string. Would make debug builds fail, too (ESP.getVersionString() failure). Fix to fall through to normal copy on a word that's got a 0 byte anywhere in it. * Add device tests for libc functional verification Add test suite used to debug libc optimized _P functions to the device tests. * Rebuild from igrr's repo (same source as prior) Rebuild .a from igrr's repo at 347260af117b4177389e69fd4d04169b11d87a97 * WIP - add exceptions * Fix exception to have 0-terminator * Move some exception constants to TEXT from RODATA * Remove throw stubs * Move more exception stuff to ROM * Enable exceptions in platform.io * Remove atexit, is duplicated in rebuilt lib Need to look at the quick-toolchain options, there seems to be a definition for atexit defined there (libgcc?) that needs to be excised. For now, remove our local do-nothing copy. * Update libgcc to remove soft-fp functions The esp-quick-toolchain generated libgcc.a needed to have the soft-FP routines that are in ROM removed from it. Remove them in the new esp-quick-toolchain and update. * Fix merge typos in Makefile * Add unhandled exception handler to postmortem * Return our atexit() handler * Latest stdc++, minimize exception emercengy area * Remove atexit from newlib atexit was defined in newlib strongly, but we also define a noop atexit in core. Since we never exit, use the core's noop and delete the atexit from libc.a Updated in esp-quick-toolchain as well. * Move __FUNCTION__ static strings to PROGMEM __FUNCTION__ is unlikely to be a timing sensitive variable, so move it to PROGMEM and not RODATA (RAM) using linker magic. asserts() now should take no RAM for any strings. * Clean up linker file, update to latest stdc++ * Update to latest stdc++ which doesn't call strerror * Update to GCC5.1 exception emergency allocator Using GCC 5.1's emergency memory allocator for exceptions, much less space is required in programs which do not use exceptions and when space is allocated it is managed more efficiently. * Initial try with new compiler toolchain * Include newlib built from esp-quick-toolchain * Update JSON with all new esp-quick-toolchain builds * Use 64bit Windows compiler on 64bit Windows * Dump std::exception.what() when possible When doing the panic on unhandled exceptions, try and grab the .what() pointer and dump it as part of the termination info. Makes it easy to see mem errors (std::bad_alloc) or std::runtime_error strings. * Use scripted install from esp-quick-toolchain Makes sure proper libraries and includes are present by using a scripted installation from esp-quick-install instead of a manual one. * Update eqk to remove atexit, fix packaging diff
Testing Arduino ESP8266 Core
Testing on host
Some features of this project can be tested by compiling and running the code on the PC, rather than running it on the ESP8266. Tests and testing infrastructure for such features is located in tests/host
directory of the project.
Some hardware features, such as Flash memory and HardwareSerial, can be emulated on the PC. Others, such as network, WiFi, and other hardware (SPI, I2C, timers, etc) are not yet emulated. This limits the amount of features which can be tested on the host.
Adding a test case
Tests are written in C++ using Catch framework.
See .cpp files under tests/host/core/ for a few examples how to write test cases.
When adding new test files, update TEST_CPP_FILES
variable in tests/host/Makefile to compile them.
If you want to add emulation of a certain feature, add it into tests/host/common/ directory.
Running test cases
To run test cases, go to tests/host/ directory and run make
. This will compile and run the tests.
If all tests pass, you will see "All tests passed" message and the exit code will be 0.
Additionally, test coverage info will be generated using gcov
tool. You can use some tool to analyze coverage information, for example lcov
:
lcov -c -d . -d ../../cores/esp8266 -o test.info
genhtml -o html test.info
This will generate an HTML report in html
directory. Open html/index.html in your browser to see the report.
Note to macOS users: you will need to install GCC using Homebrew or MacPorts. Before running make
, set CC
, CXX
, and GCOV
variables to point to GCC tools you have installed. For example, when installing gcc-5 using Homebrew:
export CC=gcc-5
export CXX=g++-5
export GCOV=gcov-5
When running lcov
(which you also need to install), specify gcov
binary using --gcov-tool $(which $GCOV)
(assuming you have already set GCOV
environment variable).
Testing on device
Most features and libraries of this project can not be tested on host. Therefore testing on an ESP8266 device is required. Such tests and the test infrastructure are located in tests/device directory of this project.
Test cases
Tests are written in the form of Arduino sketches, and placed into tests/device/test_xxx directories. These tests are compiled using Arduino IDE, so test file name should match the name of the directory it is located in (e.g. test_foobar/test_foobar.ino). Tests use a very simple BSTest library, which handles test registration and provides TEST_CASE
, CHECK
, REQUIRE
, and FAIL
macros, similar to Catch.
Note: we should migrate to Catch framework with a custom runner.
Here is a simple test case written with BSTest:
#include <BSTest.h>
#include <test_config.h>
BS_ENV_DECLARE();
void setup()
{
Serial.begin(115200);
BS_RUN(Serial);
}
TEST_CASE("this test runs successfully", "[bs]")
{
CHECK(1 + 1 == 2);
REQUIRE(2 * 2 == 4);
}
BSTest is a header-only library, so necessary static data is injected into the sketch using BS_ENV_DECLARE();
macro.
BS_RUN(Serial)
passes control to the test runner, which uses Serial
stream to communicate with the host. If you need to do any preparation before starting tests, for example connect to an AP, do this before calling BS_RUN
.
TEST_CASE
macro defines a test case. First argument is human-readable test name, second contains optional set of tags (identifiers with square brackets). Currently only one tag has special meaning: [.]
can be used to mark the test case as ignored. Such tests will not be skipped by the test runner (see below).
Test execution
Once BS_RUN
is called, BSTest library starts by printing the menu, i.e. the list of tests defined in the sketch. For example:
>>>>>bs_test_menu_begin
>>>>>bs_test_item id=1 name="this test runs successfully" desc="[bs]"
>>>>>bs_test_menu_end
Then it waits for the test index to be sent by the host, followed by newline.
Once the line number is received, the test is executed, and feedback is printed:
>>>>>bs_test_start file="arduino-esp8266/tests/device/test_tests/test_tests.ino" line=13 name="this test runs successfully" desc="[bs]"
>>>>>bs_test_end line=0 result=1 checks=2 failed_checks=0
Or, in case the test fails:
>>>>>bs_test_start file="arduino-esp8266/tests/device/test_tests/test_tests.ino" line=19 name="another test which fails" desc="[bs][fail]"
>>>>>bs_test_check_failure line=22
>>>>>bs_test_check_failure line=24
>>>>>bs_test_end line=0 result=0 checks=4 failed_checks=2
BSTest library also contains a Python script which can "talk" to the ESP8266 board and run the tests, tests/device/libraries/BSTest/runner.py. Normally it is not necessary to use this script directly, as the top level Makefile in tests/device/ directory can call it automatically (see below).
Test configuration
Some tests need to connect to WiFi AP or to the PC running the tests. In the test code, this configuration is read from environment variables (the ones set using C getenv
/setenv
functions). There are two ways environment variables can be set.
-
Environment variables which apply to all or most of the tests can be defined in
tests/device/test_env.cfg
file. This file is not present in Git by default. Make a copy oftests/device/test_env.cfg.template
and change the values to suit your environment. -
Environment variables which apply to a specific test can be set dynamically by the
setup
host side helper (see section below). This is done usingsetenv
function defined inmock_decorators
.
Environment variables can also be used to pass some information from the test code to the host side helper. To do that, test code can set an environment variable using setenv
C function. Then the teardown
host side helper can obtain the value of that variable using request_env
function defined in mock_decorators
.
A SPIFFS filesystem may be generated on the host and uploade before a test by including a file called make_spiffs.py
in the individual test directory.
Building and running the tests
Makefile in tests/device/ directory handles compiling, uploading, and executing test cases.
Here are some of the supported targets:
-
virtualenv
: prepares Python virtual environment inside tests/device/libaries/BSTest/virtualenv/. This has to be run once on each computer where tests are to be run. This target will usepip
to install several Python libraries required by the test runner (see tests/device/libaries/BSTest/requirements.txt). -
test_xxx/test_xxx.ino
: compiles, uploads, and runs the tests defined intest_xxx/test_xxx.ino
sketch. Some extra options are available, these can be passed as additional arguments tomake
:NO_BUILD=1
: don't compile the test.NO_UPLOAD=1
: don't upload the test.NO_RUN=1
: don't run the test.V=1
: enable verbose output from compilation, upload, and test runner.
For example,
make test_newlib/test_newlib.ino V=1
will compile, upload, and run all tests defined intest_newlib/test_newlib.ino
.For each test sketch, test results are stored in
tests/device/.build/test_xxx.ino/test_result.xml
. This file is an xUnit XML file, and can be read by a variety of tools, such as Jenkins. -
test_report
: Generate HTML test report from xUnit XML files produced by test runs. -
all
(or justmake
without a target): Run tests from all the .ino files, and generate HTML test report.
Host-side helpers
Some tests running on the device need a matching part running on the host. For example, HTTP client test might need a web server running on the host to connect to. TCP server test might need to be connected to by TCP client running on the host. To support such use cases, for each test file, an optional Python test file can be provided. This Python file defines setup and teardown functions which have to be run before and after the test is run on the device. setup
and teardown
decorators bind setup/teardown functions to the test with specified name:
from mock_decorators import setup, teardown, setenv, request_env
@setup('WiFiClient test')
def setup_wificlient_test(e):
# create a TCP server
# pass environment variable to the test
setenv(e, 'SERVER_PORT', '10000')
setenv(e, 'SERVER_IP', repr(server_ip))
@teardown('WiFiClient test')
def teardown_wificlient_test(e):
# delete TCP server
# request environment variable from the test, compare to the expected value
read_bytes = request_env(e, 'READ_BYTES')
assert(read_bytes == '4096')
Corresponding test code might look like this:
TEST_CASE("WiFiClient test", "[wificlient]")
{
const char* server_ip = getenv("SERVER_IP");
int server_port = (int) strtol(getenv("SERVER_PORT"), NULL, 0);
WiFiClient client;
REQUIRE(client.connect(server_ip, server_port));
// read data from server
// ...
// Save the result back so that host side helper can read it
setenv("READ_BYTES", String(read_bytes).c_str(), 1);
}