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 06/16] src/locktest.c: Fix return code if last test fails
Date: Mon, 23 Sep 2019 10:51:54 -0700 [thread overview]
Message-ID: <20190923175204.2139-7-ira.weiny@intel.com> (raw)
In-Reply-To: <20190923175204.2139-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
If anything but the first step of the last test fails, the exit code
(fail_count) was not properly set. Fix this such that follow on patches
will be able to save error output and correctly inform the script that a
failure has occurred rather than just expecting random output to fail
the diff check.
The issue is last_test is not properly tracking which test the loop is
currently on. Therefore fail_count would not be incremented correctly.
Remove the special case of checking for the end of the steps array and
track last_test properly. Then adjust test_count to be correct for the
new code.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
src/locktest.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/locktest.c b/src/locktest.c
index 3abb91120144..241e7c451724 100644
--- a/src/locktest.c
+++ b/src/locktest.c
@@ -963,7 +963,7 @@ main(int argc, char *argv[])
int end = 0;
int result = 0;
int last_test = 0;
- int test_count = 0;
+ int test_count = -1;
int fail_flag = 0;
while(!end) {
if (server) {
@@ -1058,15 +1058,13 @@ main(int argc, char *argv[])
}
}
}
- if(tests[index][TEST_NUM] != 0) {
- if(last_test != tests[index][TEST_NUM]) {
- test_count++;
- if(fail_flag)
- fail_count++;
- fail_flag = 0;
- }
- last_test = tests[index][TEST_NUM];
+ if(last_test != tests[index][TEST_NUM]) {
+ test_count++;
+ if(fail_flag)
+ fail_count++;
+ fail_flag = 0;
+ last_test = tests[index][TEST_NUM];
}
index++;
@@ -1126,9 +1124,8 @@ main(int argc, char *argv[])
fprintf(stderr,"client: sending result to server (%d)\n", ctl.index);
/* Send result to the server */
send_ctl();
- if(tests[index][TEST_NUM] != 0) {
- if(last_test != tests[index][TEST_NUM])
- test_count++;
+ if(last_test != tests[index][TEST_NUM]) {
+ test_count++;
last_test = tests[index][TEST_NUM];
}
}
--
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 ` ira.weiny [this message]
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 ` [PATCH V2 09/16] src/locktest: Clean up error output ira.weiny
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 06/16] src/locktest.c: Fix return code if last test fails 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-7-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).