diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-27 16:25:25 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-27 16:25:25 -0500 |
| commit | c0aa7ac5acd7b6f1d261a8a6eb5db2d3571e1f2f (patch) | |
| tree | 0e2d5196e236390f7f4fb85272ea25a22d73afeb /src/test | |
| parent | 4808540d5c8e132c6ea4db13e25faff6446dc674 (diff) | |
| parent | b923c4dc9f011ab8f62e03211407d042dbe9f92a (diff) | |
| download | tor-c0aa7ac5acd7b6f1d261a8a6eb5db2d3571e1f2f.tar.gz tor-c0aa7ac5acd7b6f1d261a8a6eb5db2d3571e1f2f.zip | |
Merge branch 'disable_memory_sentinels_squashed'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_util.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index e80201737a..5b4d5b7703 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3340,6 +3340,13 @@ test_util_memarea(void *arg) void *malloced_ptr = NULL; int i; +#ifdef DISABLE_MEMORY_SENTINELS + /* If memory sentinels are disabled, this whole module is just an alias for + malloc(), which is free to lay out memory most any way it wants. */ + if (1) + tt_skip(); +#endif + (void)arg; tt_assert(area); |