diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-01-16 01:36:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:43:36 -0500 |
| commit | 6967a73f360d746de19068ee9d1e46a94101edb2 (patch) | |
| tree | 46efe9e251b47addd4d0bb81c2fc4f339c280644 | |
| parent | 6688846ee1613392c2dc6b11e33732adc656b362 (diff) | |
| download | samba-6967a73f360d746de19068ee9d1e46a94101edb2.tar.gz samba-6967a73f360d746de19068ee9d1e46a94101edb2.tar.bz2 samba-6967a73f360d746de19068ee9d1e46a94101edb2.zip | |
r20823: Remove newlines in calls to torture_fail().
(This used to be commit 37c0cfe83bd9b9f799c880e3b5052a49631a113e)
| -rw-r--r-- | source4/torture/basic/base.c | 4 | ||||
| -rw-r--r-- | source4/torture/local/dbspeed.c | 10 | ||||
| -rw-r--r-- | source4/torture/local/iconv.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 1fdddd0856..dcec1bbfb5 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -93,7 +93,7 @@ static BOOL tcon_devtest(struct torture_context *tctx, if (status) { torture_fail(tctx, talloc_asprintf(tctx, "tconx to share %s with type %s " - "should have failed but succeeded\n", + "should have failed but succeeded", myshare, devtype)); } else { if (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree), @@ -725,7 +725,7 @@ static BOOL run_vuidtest(struct torture_context *tctx, NT_STATUS_INVALID_HANDLE)) { torture_fail(tctx, talloc_asprintf(tctx, "qfileinfo should have returned DOS error " - "ERRSRV:ERRbaduid\n but returned %s\n", + "ERRSRV:ERRbaduid\n but returned %s", smbcli_errstr(cli->tree))); } diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c index 2d521394ce..298c5e3a2a 100644 --- a/source4/torture/local/dbspeed.c +++ b/source4/torture/local/dbspeed.c @@ -63,7 +63,7 @@ static BOOL test_tdb_speed(struct torture_context *torture, const void *_data) tdbw = tdb_wrap_open(tmp_ctx, "test.tdb", 10000, 0, O_RDWR|O_CREAT|O_TRUNC, 0600); if (!tdbw) { - torture_fail(torture, "Failed to open test.tdb\n"); + torture_fail(torture, "Failed to open test.tdb"); goto failed; } @@ -171,7 +171,7 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data) ldb = ldb_wrap_connect(tmp_ctx, "tdb://test.ldb", NULL, NULL, LDB_FLG_NOSYNC, NULL); if (!ldb) { - torture_fail(torture, "Failed to open test.ldb\n"); + torture_fail(torture, "Failed to open test.ldb"); goto failed; } @@ -207,20 +207,20 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data) i = random() % torture_entries; dn = ldb_dn_new_fmt(tmp_ctx, ldb, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", i); if (ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res) != LDB_SUCCESS || res->count != 1) { - torture_fail(torture, talloc_asprintf(torture, "Failed to find SID %d\n", i)); + torture_fail(torture, talloc_asprintf(torture, "Failed to find SID %d", i)); } talloc_free(res); talloc_free(dn); expr = talloc_asprintf(tmp_ctx, "(UID=%u)", i); if (ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res) != LDB_SUCCESS || res->count != 1) { - torture_fail(torture, talloc_asprintf(torture, "Failed to find UID %d\n", i)); + torture_fail(torture, talloc_asprintf(torture, "Failed to find UID %d", i)); } talloc_free(res); talloc_free(expr); } if (talloc_total_blocks(torture) > 100) { - torture_fail(torture, "memory leak in ldb search\n"); + torture_fail(torture, "memory leak in ldb search"); goto failed; } diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c index 9ef1849e43..45c01221d7 100644 --- a/source4/torture/local/iconv.c +++ b/source4/torture/local/iconv.c @@ -133,7 +133,7 @@ static bool test_buffer(struct torture_context *test, if (cd == (iconv_t)-1) { torture_fail(test, talloc_asprintf(test, - "failed to open %s to UTF-16LE\n", + "failed to open %s to UTF-16LE", charset)); cd = NULL; return false; |