diff options
| author | Aravind Srinivasan <asrinivasan@isilon.com> | 2009-09-08 13:12:26 -0700 |
|---|---|---|
| committer | Steven Danneman <steven.danneman@isilon.com> | 2009-09-09 10:22:12 -0700 |
| commit | c091d4b08c23ba8c839e095d9ad3dbdbab5050f3 (patch) | |
| tree | f4ccc5a2048bafb5bc7d664259b213f7952bb0dc /source4/torture | |
| parent | adca9f681cda79511c6974b47005316dc3889ebb (diff) | |
| download | samba-c091d4b08c23ba8c839e095d9ad3dbdbab5050f3.tar.gz samba-c091d4b08c23ba8c839e095d9ad3dbdbab5050f3.tar.bz2 samba-c091d4b08c23ba8c839e095d9ad3dbdbab5050f3.zip | |
s4/torture: convert printf to torture_comment()
Allows "make test" and other harnesses to print cleaner output.
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/raw/oplock.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 3493a552c3..406a65c79c 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -193,7 +193,8 @@ static bool open_connection_no_level2_oplocks(struct torture_context *tctx, lp_iconv_convenience(tctx->lp_ctx), lp_gensec_settings(tctx, tctx->lp_ctx)); if (!NT_STATUS_IS_OK(status)) { - printf("Failed to open connection - %s\n", nt_errstr(status)); + torture_comment(tctx, "Failed to open connection - %s\n", + nt_errstr(status)); return false; } @@ -594,7 +595,8 @@ static bool test_raw_oplock_exclusive6(struct torture_context *tctx, struct smbc io.ntcreatex.in.security_flags = 0; io.ntcreatex.in.fname = fname1; - torture_comment(tctx, "EXCLUSIVE6: open a file with an exclusive oplock (share mode: none)\n"); + torture_comment(tctx, "EXCLUSIVE6: open a file with an exclusive " + "oplock (share mode: none)\n"); ZERO_STRUCT(break_info); io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED | NTCREATEX_FLAGS_REQUEST_OPLOCK; @@ -603,14 +605,15 @@ static bool test_raw_oplock_exclusive6(struct torture_context *tctx, struct smbc fnum = io.ntcreatex.out.file.fnum; CHECK_VAL(io.ntcreatex.out.oplock_level, EXCLUSIVE_OPLOCK_RETURN); - torture_comment(tctx, "rename should not generate a break but get a sharing violation\n"); + torture_comment(tctx, "rename should not generate a break but get a " + "sharing violation\n"); ZERO_STRUCT(rn); rn.generic.level = RAW_RENAME_RENAME; rn.rename.in.pattern1 = fname1; rn.rename.in.pattern2 = fname2; rn.rename.in.attrib = 0; - printf("trying rename while first file open\n"); + torture_comment(tctx, "trying rename while first file open\n"); status = smb_raw_rename(cli2->tree, &rn); CHECK_STATUS(tctx, status, NT_STATUS_SHARING_VIOLATION); @@ -1922,7 +1925,7 @@ static bool test_raw_oplock_batch17(struct torture_context *tctx, struct smbcli_ rn.rename.in.pattern2 = fname2; rn.rename.in.attrib = 0; - printf("trying rename while first file open\n"); + torture_comment(tctx, "trying rename while first file open\n"); status = smb_raw_rename(cli2->tree, &rn); CHECK_STATUS(tctx, status, NT_STATUS_SHARING_VIOLATION); @@ -1993,7 +1996,7 @@ static bool test_raw_oplock_batch18(struct torture_context *tctx, struct smbcli_ rn.ntrename.in.flags = RENAME_FLAG_RENAME; rn.ntrename.in.old_name = fname1; rn.ntrename.in.new_name = fname2; - printf("trying rename while first file open\n"); + torture_comment(tctx, "trying rename while first file open\n"); status = smb_raw_rename(cli2->tree, &rn); CHECK_STATUS(tctx, status, NT_STATUS_SHARING_VIOLATION); |