diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-17 19:06:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:20 -0500 |
| commit | 1e818c463af84b6aeb462a7faa4c15603b7b90d7 (patch) | |
| tree | 7c17f81a16688c767b9b11e7f3509a8d685c14a7 /source4/torture/local | |
| parent | 67abfc498142f3ea16f682ddf335042be900438a (diff) | |
| download | samba-1e818c463af84b6aeb462a7faa4c15603b7b90d7.tar.gz samba-1e818c463af84b6aeb462a7faa4c15603b7b90d7.tar.bz2 samba-1e818c463af84b6aeb462a7faa4c15603b7b90d7.zip | |
r19377: Simplify report functions.
(This used to be commit 0061f3c47e95f07461837c4051cf129b18961b56)
Diffstat (limited to 'source4/torture/local')
| -rw-r--r-- | source4/torture/local/dbspeed.c | 12 | ||||
| -rw-r--r-- | source4/torture/local/event.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c index 3f9607eb81..4eac7c9499 100644 --- a/source4/torture/local/dbspeed.c +++ b/source4/torture/local/dbspeed.c @@ -73,13 +73,13 @@ static BOOL test_tdb_speed(struct torture_context *torture, const void *_data) if (!tdb_add_record(tdbw, "S-1-5-21-53173311-3623041448-2049097239-%u", "UID %u", i)) { - _torture_fail_ext(torture, "Failed to add SID %d", i); + torture_result(torture, TORTURE_FAIL, "Failed to add SID %d", i); goto failed; } if (!tdb_add_record(tdbw, "UID %u", "S-1-5-21-53173311-3623041448-2049097239-%u", i)) { - _torture_fail_ext(torture, "Failed to add UID %d", i); + torture_result(torture, TORTURE_FAIL, "Failed to add UID %d", i); goto failed; } } @@ -95,7 +95,7 @@ static BOOL test_tdb_speed(struct torture_context *torture, const void *_data) key.dsize = strlen((char *)key.dptr)+1; data = tdb_fetch(tdbw->tdb, key); if (data.dptr == NULL) { - _torture_fail_ext(torture, "Failed to fetch SID %d", i); + torture_result(torture, TORTURE_FAIL, "Failed to fetch SID %d", i); goto failed; } free(data.dptr); @@ -103,7 +103,7 @@ static BOOL test_tdb_speed(struct torture_context *torture, const void *_data) key.dsize = strlen((char *)key.dptr)+1; data = tdb_fetch(tdbw->tdb, key); if (data.dptr == NULL) { - _torture_fail_ext(torture, "Failed to fetch UID %d", i); + torture_result(torture, TORTURE_FAIL, "Failed to fetch UID %d", i); goto failed; } free(data.dptr); @@ -186,13 +186,13 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data) for (i=0;i<torture_entries;i++) { if (!ldb_add_record(ldb, i)) { - _torture_fail_ext(torture, "Failed to add SID %d", i); + torture_result(torture, TORTURE_FAIL, "Failed to add SID %d", i); goto failed; } } if (talloc_total_blocks(torture) > 100) { - _torture_fail_ext(torture, "memory leak in ldb add"); + torture_result(torture, TORTURE_FAIL, "memory leak in ldb add"); goto failed; } diff --git a/source4/torture/local/event.c b/source4/torture/local/event.c index 6579b1b277..a03f07bf33 100644 --- a/source4/torture/local/event.c +++ b/source4/torture/local/event.c @@ -46,7 +46,8 @@ static void fde_handler(struct event_context *ev_ctx, struct fd_event *f, (flags & EVENT_FD_WRITE)?" EVENT_FD_WRITE":""); if (fde_count > 5) { - _torture_fail_ext(test, "got more than fde 5 events - bug!"); + torture_result(test, TORTURE_FAIL, + __location__": got more than fde 5 events - bug!"); talloc_free(fde); fde = NULL; return; |