From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v2] lib/tst_test.c: Run test in child process
Date: Wed, 8 Jun 2016 15:55:29 +0200 [thread overview]
Message-ID: <20160608135528.GB27367@rei.lan> (raw)
In-Reply-To: <1570517895.4619774.1465392983796.JavaMail.zimbra@redhat.com>
Hi!
> > Ah, right, that is since what was previously main_pid has been split
> > into the library process and main test process.
> >
> > Indeed the cleanup_ipc() should be called from the library in the
> > tst_vbrk_().
> ...
> > Looks good to me, acked.
>
> Pushed.
And looking at the code closely, this is not enough, since we have:
if (WIFEXITED(status) && WEXITSTATUS(status))
exit(WEXITSTATUS(status));
in the tst_run_tcases(). So we have to call cleanup_ipc() before the
exit() here as well.
Also we do not count the TBROK in results structure, since the TBROK is
propagated only by exit value so do_exit() will exit with 0 in case that
we TBROK in the test library.
This is getting more complicated than I would like.
Minimal patch to fix this would be:
diff --git a/lib/tst_test.c b/lib/tst_test.c
index f7485bd..67d778e 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -237,7 +237,7 @@ void tst_vbrk_(const char *file, const int lineno, int ttype,
do_test_cleanup();
if (getpid() == lib_pid)
- do_exit();
+ cleanup_ipc();
exit(TTYPE_RESULT(ttype));
}
@@ -718,8 +718,10 @@ void tst_run_tcases(int argc, char *argv[], struct tst_test *self)
do_cleanup();
- if (WIFEXITED(status) && WEXITSTATUS(status))
+ if (WIFEXITED(status) && WEXITSTATUS(status)) {\
+ cleanup_ipc();
exit(WEXITSTATUS(status));
+ }
if (WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL) {
tst_res(TINFO, "If you are running on slow machine, "
Or we may change do_exit() to take parameter so that we can actually
pass the TBROK to it, in a case that you want to print the statistics in
this case as well...
--
Cyril Hrubis
chrubis@suse.cz
next prev parent reply other threads:[~2016-06-08 13:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 11:58 [LTP] [PATCH v2] lib/tst_test.c: Run test in child process Cyril Hrubis
2016-06-08 8:17 ` Jan Stancek
2016-06-08 12:30 ` Cyril Hrubis
2016-06-08 12:59 ` Jan Stancek
2016-06-08 13:15 ` Cyril Hrubis
2016-06-08 13:36 ` Jan Stancek
2016-06-08 13:55 ` Cyril Hrubis [this message]
2016-06-08 14:06 ` Cyril Hrubis
2016-06-08 14:31 ` Jan Stancek
2016-06-08 14:32 ` Cyril Hrubis
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=20160608135528.GB27367@rei.lan \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/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