From: ira.weiny@intel.com
To: fstests@vger.kernel.org, Eryu Guan <guaneryu@gmail.com>
Cc: john.hubbard@gmail.com, Dave Chinner <david@fromorbit.com>,
Jan Kara <jack@suse.cz>, Jason Gunthorpe <jgg@ziepe.ca>,
dan.j.williams@intel.com, Jeff Layton <jlayton@kernel.org>,
Ira Weiny <ira.weiny@intel.com>
Subject: [PATCH V2 09/16] src/locktest: Clean up error output
Date: Mon, 23 Sep 2019 10:51:57 -0700 [thread overview]
Message-ID: <20190923175204.2139-10-ira.weiny@intel.com> (raw)
In-Reply-To: <20190923175204.2139-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Add some debugging
Make sure all errors go to stderr
Clean up formatting and make failures stand out
Report test results for the client not just the server
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from v1:
Moved earlier in the series
src/locktest.c | 45 ++++++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/locktest.c b/src/locktest.c
index 241e7c451724..159d13291f79 100644
--- a/src/locktest.c
+++ b/src/locktest.c
@@ -827,6 +827,8 @@ main(int argc, char *argv[])
}
filename=argv[optind];
+ if (debug)
+ fprintf(stderr, "Working on file : %s\n", filename);
if (do_open(O_RDWR) == FAIL)
exit(1);
@@ -905,10 +907,10 @@ main(int argc, char *argv[])
struct hostent *servInfo;
if ((servInfo = gethostbyname(host)) == NULL) {
- printf("Couldn't get hostbyname for %s", host);
+ fprintf(stderr, "Couldn't get hostbyname for %s", host);
if (h_errno == HOST_NOT_FOUND)
- printf(": host not found");
- printf("\n");
+ fprintf(stderr, ": host not found");
+ fprintf(stderr, "\n");
exit(1);
/*NOTREACHED*/
}
@@ -1011,16 +1013,14 @@ main(int argc, char *argv[])
if( result != tests[index][RESULT]) {
fail_flag++;
/* We have a failure */
- if(debug)
- fprintf(stderr, "Server failure in test %d, while %sing using offset %lld, length %lld - err = %d:%s\n",
- ctl.test,
- get_cmd_str(tests[index][COMMAND]),
- (long long)tests[index][OFFSET],
- (long long)tests[index][LENGTH],
- saved_errno, strerror(saved_errno));
- fprintf(stderr, "Server failure in %lld:%s\n",
- (long long)tests[index][TEST_NUM],
- descriptions[tests[index][TEST_NUM] - 1]);
+ fprintf(stderr, " ***** Server failure *****\n");
+ fprintf(stderr, " in test %d, while %sing using offset %lld, length %lld - err = %d:%s\n",
+ ctl.test, get_cmd_str(tests[index][COMMAND]),
+ (long long)tests[index][OFFSET],
+ (long long)tests[index][LENGTH],
+ saved_errno, strerror(saved_errno));
+ fprintf(stderr, " %d:%s\n",
+ ctl.test, descriptions[ctl.test - 1]);
}
}
/* else send it off to the client */
@@ -1047,14 +1047,13 @@ main(int argc, char *argv[])
* not what the command returned */
if( ctl.result == FAIL ) {
fail_flag++;
- if(debug)
- fprintf(stderr, "Client failure in test %d, while %sing using offset %lld, length %lld - err = %d:%s\n",
+ fprintf(stderr, " ***** Client failure *****\n");
+ fprintf(stderr, " in test %d, while %sing using offset %lld, length %lld - err = %d:%s\n",
ctl.test, get_cmd_str(ctl.command),
(long long)ctl.offset, (long long)ctl.length,
ctl.error, strerror(ctl.error));
- fprintf(stderr, "Client failure in %lld:%s\n",
- (long long)tests[index][TEST_NUM],
- descriptions[tests[index][TEST_NUM] - 1]);
+ fprintf(stderr, " %d:%s\n",
+ ctl.test, descriptions[ctl.test - 1]);
}
}
}
@@ -1110,9 +1109,10 @@ main(int argc, char *argv[])
break;
}
if( result != ctl.result ) {
- if(debug)
- fprintf(stderr,"Got %d, wanted %d\n",
- result, ctl.result);
+ fprintf(stderr,"Failure in %d:%s\n",
+ ctl.test, descriptions[ctl.test - 1]);
+ fprintf(stderr," Got %d, wanted %d\n",
+ result, ctl.result);
ctl.result = FAIL;
ctl.error = saved_errno;
fail_count++;
@@ -1130,8 +1130,7 @@ main(int argc, char *argv[])
}
}
}
- if(server)
- printf("%d tests run, %d failed\n", test_count, fail_count);
+ fprintf(stderr, "%d tests run, %d failed\n", test_count, fail_count);
}
exit(fail_count);
--
2.20.1
next prev parent reply other threads:[~2019-09-23 17:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 17:51 [PATCH V2 00/16] Fix locktest and add lease testing to it ira.weiny
2019-09-23 17:51 ` [PATCH V2 01/16] src/locktest: Remove unnecessary sleep ira.weiny
2019-09-23 17:51 ` [PATCH V2 02/16] src/locktest: Remove OPEN macro ira.weiny
2019-09-23 17:51 ` [PATCH V2 03/16] src/locktest: Change command macro names ira.weiny
2019-09-23 17:51 ` [PATCH V2 04/16] src/locktest: Add get_cmd_str ira.weiny
2019-09-23 17:51 ` [PATCH V2 05/16] src/locktest.c: Clean up client command passing ira.weiny
2019-09-23 17:51 ` [PATCH V2 06/16] src/locktest.c: Fix return code if last test fails ira.weiny
2019-09-23 17:51 ` [PATCH V2 07/16] generic/131: Clean up pid variables ira.weiny
2019-09-23 17:51 ` [PATCH V2 08/16] generic/131: Save stderr for debugging ira.weiny
2019-09-23 17:51 ` ira.weiny [this message]
2019-09-23 17:51 ` [PATCH V2 10/16] src/locktest: Audit all debug output ira.weiny
2019-09-23 17:51 ` [PATCH V2 11/16] src/locktest: Add run() function ira.weiny
2019-09-23 17:58 ` [PATCH V2 00/16] Fix locktest and add lease testing to it Ira Weiny
2019-09-23 17:53 ira.weiny
2019-09-23 17:53 ` [PATCH V2 09/16] src/locktest: Clean up error output ira.weiny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190923175204.2139-10-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
--cc=jack@suse.cz \
--cc=jgg@ziepe.ca \
--cc=jlayton@kernel.org \
--cc=john.hubbard@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).