talloc: use failtest to test failure paths.

[ccan] / ccan / talloc / test / run.c

diff --git a/ccan/talloc/test/run.c b/ccan/talloc/test/run.c
index ad70a51ec77761059470347acbbdaa4cbf5d3e37..564f1e85922d9bef65b1c3d7053b9e56cf3e7958 100644 (file)
--- a/ccan/talloc/test/run.c
+++ b/ccan/talloc/test/run.c
@@ -25,9 +25,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "talloc/talloc.c"
+#include <ccan/talloc/talloc.c>
 #include <stdbool.h>
-#include "tap/tap.h"
+#include <ccan/tap/tap.h>
 
 #define torture_assert(test, expr, str)                                        \
        ok(expr, "%s [\n%s: Expression %s failed: %s\n]\n",             \
@@ -438,14 +438,14 @@ static bool test_realloc(const struct torture_context *ctx)
                "failed: talloc_realloc() on a referenced pointer should fail\n");
        CHECK_BLOCKS("realloc", p1, 4);
 
-       talloc_realloc_size(NULL, p2, 0);
-       talloc_realloc_size(NULL, p2, 0);
+       ok1(talloc_realloc_size(NULL, p2, 0) == NULL);
+       ok1(talloc_realloc_size(NULL, p2, 0) == NULL);
        CHECK_BLOCKS("realloc", p1, 3);
 
        torture_assert("realloc", talloc_realloc_size(NULL, p1, 0x7fffffff) == NULL,
                "failed: oversize talloc should fail\n");
 
-       talloc_realloc_size(NULL, p1, 0);
+       p1 = talloc_realloc_size(NULL, p1, 0);
 
        CHECK_BLOCKS("realloc", root, 1);
        CHECK_SIZE("realloc", root, 0);
@@ -948,7 +948,7 @@ int main(void)
 {
        struct torture_context *ctx;
 
-       plan_tests(284);
+       plan_tests(289);
        ctx = talloc_add_external(NULL, normal_realloc, test_lock, test_unlock);
 
        torture_local_talloc(NULL);
@@ -979,6 +979,10 @@ int main(void)
        ok(allocations_used() == 0, "%u allocations still used?",
           allocations_used());
 
+       /* This closes the leak, but make sure we're not freeing unexpected. */
+       ok1(!talloc_chunk_from_ptr(null_context)->child);
+       talloc_disable_null_tracking();
+       
        return exit_status();
 }