Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up to |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| CMakeLists.txt | ||
| Makefile.am | ||
| Makefile.inc | ||
| README.md | ||
| unit1300.c | ||
| unit1302.c | ||
| unit1303.c | ||
| unit1304.c | ||
| unit1305.c | ||
| unit1307.c | ||
| unit1309.c | ||
| unit1323.c | ||
| unit1330.c | ||
| unit1395.c | ||
| unit1396.c | ||
| unit1397.c | ||
| unit1398.c | ||
| unit1399.c | ||
| unit1600.c | ||
| unit1601.c | ||
| unit1602.c | ||
| unit1603.c | ||
| unit1605.c | ||
| unit1606.c | ||
| unit1607.c | ||
| unit1608.c | ||
| unit1609.c | ||
| unit1610.c | ||
| unit1611.c | ||
| unit1612.c | ||
| unit1614.c | ||
| unit1615.c | ||
| unit1616.c | ||
| unit1620.c | ||
| unit1650.c | ||
| unit1651.c | ||
| unit1652.c | ||
| unit1653.c | ||
| unit1654.c | ||
| unit1655.c | ||
| unit1656.c | ||
| unit1657.c | ||
| unit1658.c | ||
| unit1660.c | ||
| unit1661.c | ||
| unit1663.c | ||
| unit1664.c | ||
| unit1979.c | ||
| unit1980.c | ||
| unit2600.c | ||
| unit2601.c | ||
| unit2602.c | ||
| unit2603.c | ||
| unit2604.c | ||
| unit2605.c | ||
| unit3200.c | ||
| unit3205.c | ||
| unit3211.c | ||
| unit3212.c | ||
| unit3213.c | ||
| unit3214.c | ||
| unit3216.c | ||
Unit tests
The goal is to add tests for all functions in libcurl. If functions are too big and complicated, we should split them into smaller and testable ones.
Build Unit Tests
./configure --enable-debug is required for the unit tests to build. To
enable unit tests, there is a separate static libcurl built that is used
exclusively for linking unit test programs. Just build everything as normal,
and then you can run the unit test cases as well.
Run Unit Tests
Unit tests are run as part of the regular test suite. If you have built
everything to run unit tests, to can do 'make test' at the root level. Or you
can cd tests and make and then invoke individual unit tests with
./runtests.pl NNNN where NNNN is the specific test number.
Debug Unit Tests
If a specific test fails you get told. The test case then has output left in
the %LOGDIR subdirectory, but most importantly you can re-run the test again
using gdb by doing ./runtests.pl -g NNNN. That is, add a -g to make it
start up gdb and run the same case using that.
Write Unit Tests
We put tests that focus on an area or a specific function into a single C
source file. The source file should be named unitNNNN.c where NNNN is a
previously unused number.
Add your test to tests/unit/Makefile.inc (if it is a unit test). Add your
test data filename to tests/data/Makefile.am
You also need a separate file called tests/data/testNNNN (using the same
number) that describes your test case. See the test1300 file for inspiration
and the tests/FILEFORMAT.md documentation.
For the actual C file, here's a simple example:
#include "unitcheck.h"
#include "a libcurl header.h" /* from the lib directory */
static CURLcode test_unit9998(const char *arg)
{
UNITTEST_BEGIN_SIMPLE
/* here you start doing things and checking that the results are good */
fail_unless( size == 0 , "initial size should be zero" );
fail_if( head == NULL , "head should not be initiated to NULL" );
/* you end the test code like this: */
UNITTEST_END_SIMPLE
}
Here's an example using optional initialization and cleanup:
#include "unitcheck.h"
#include "a libcurl header.h" /* from the lib directory */
static CURLcode t9999_setup(void)
{
/* whatever you want done first */
return CURLE_OK;
}
static void t9999_stop(void)
{
/* done before shutting down and exiting */
}
static CURLcode test_unit9999(const char *arg)
{
UNITTEST_BEGIN(t9999_setup())
/* here you start doing things and checking that the results are good */
fail_unless( size == 0 , "initial size should be zero" );
fail_if( head == NULL , "head should not be initiated to NULL" );
/* you end the test code like this: */
UNITTEST_END(t9999_stop())
}