linux-rt-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Wagner <dwagner@suse.de>
To: Clark Williams <williams@redhat.com>, John Kacur <jkacur@redhat.com>
Cc: linux-rt-users@vger.kernel.org, Daniel Wagner <dwagner@suse.de>
Subject: [PATCH rt-tests v2 14/14] ssdd: Add JSON output feature
Date: Fri,  5 Mar 2021 08:35:00 +0100	[thread overview]
Message-ID: <20210305073500.17926-15-dwagner@suse.de> (raw)
In-Reply-To: <20210305073500.17926-1-dwagner@suse.de>

Write the test results as JSON output to a file. This allows to
simplifies any parsing later on.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
 src/ssdd/ssdd.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/ssdd/ssdd.c b/src/ssdd/ssdd.c
index 50bec824b2e8..3ead14d0127e 100644
--- a/src/ssdd/ssdd.c
+++ b/src/ssdd/ssdd.c
@@ -36,6 +36,8 @@
 #include <sys/wait.h>
 #include <sys/ptrace.h>
 
+#include "rt-utils.h"
+
 /* do_wait return values */
 #define STATE_EXITED	1
 #define STATE_STOPPED	2
@@ -65,10 +67,11 @@ static const char *get_state_name(int state)
 #define unused __attribute__((unused))
 
 static int quiet;
+static char outfile[MAX_PATH];
 
 static int got_sigchld;
 
-enum option_value { OPT_NFORKS=1, OPT_NITERS, OPT_HELP, OPT_QUIET };
+enum option_value { OPT_NFORKS=1, OPT_NITERS, OPT_HELP, OPT_OUTPUT, OPT_QUIET };
 
 static void usage(int error)
 {
@@ -77,6 +80,7 @@ static void usage(int error)
 	       "ssdd <options>\n\n"
 	       "-f       --forks=NUM       number of forks\n"
 	       "-h       --help            print this message\n"
+	       "         --output=FILENAME write final results into FILENAME, JSON formatted\n"
 	       "-q       --quiet           suppress running output\n"
 	       "-i       --iters=NUM       number of iterations\n"
 	       );
@@ -295,12 +299,14 @@ int main(int argc, char **argv)
 
 	setbuf(stdout, NULL);
 
+	rt_init(argc, argv);
 	for (;;) {
 		int option_index = 0;
 
 		static struct option long_options[] = {
 			{"forks",		required_argument,	NULL, OPT_NFORKS},
 			{"help",		no_argument,		NULL, OPT_HELP},
+			{"output",		required_argument,	NULL, OPT_OUTPUT},
 			{"quiet",		no_argument,		NULL, OPT_QUIET},
 			{"iters",		required_argument,	NULL, OPT_NITERS},
 			{NULL, 0, NULL, 0},
@@ -317,6 +323,9 @@ int main(int argc, char **argv)
 		case OPT_HELP:
 			usage(0);
 			break;
+		case OPT_OUTPUT:
+			strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1));
+			break;
 		case OPT_QUIET:
 		case 'q':
 			quiet = 1;
@@ -348,6 +357,7 @@ int main(int argc, char **argv)
 			forktests(i);
 	}
 
+	rt_test_start();
 	for (i = 0; i < nforks; i++) {
 		status = do_wait(&wait_pid, &ret_sig);
 		if (status != STATE_EXITED) {
@@ -363,5 +373,9 @@ int main(int argc, char **argv)
 	printf("%s.\n", error ?
 		"One or more tests FAILED" :
 		"All tests PASSED");
+
+	if (strlen(outfile) != 0)
+		rt_write_json(outfile, error, NULL, NULL);
+
 	exit(error);
 }
-- 
2.30.1


  parent reply	other threads:[~2021-03-05  7:35 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-05  7:34 [PATCH rt-tests v2 00/14] JSON cleanups and more tests updated Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 01/14] cyclictest: Fix printf format specifier Daniel Wagner
2021-03-14 22:45   ` John Kacur
2021-03-15  8:57     ` Daniel Wagner
2021-03-15  8:58       ` Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 02/14] cyclicdeadline.c: " Daniel Wagner
2021-03-14 22:45   ` John Kacur
2021-03-05  7:34 ` [PATCH rt-tests v2 03/14] signaltest: Add missing --output usage info Daniel Wagner
2021-03-14 22:47   ` John Kacur
2021-03-05  7:34 ` [PATCH rt-tests v2 04/14] rt-util: Copy command line before getopt_long() is called Daniel Wagner
2021-03-15  5:47   ` John Kacur
2021-03-15  8:56     ` Daniel Wagner
2021-03-15 14:41       ` John Kacur
2021-03-05  7:34 ` [PATCH rt-tests v2 05/14] rt-util: Add start time of test execution for JSON output Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 06/14] rt-util: Add return_code to common section of " Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 07/14] pip_stress: Move test result output to main Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 08/14] pip_stress: Return failure code if test fails Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 09/14] pip_stress: Prepare arg parser to accept only long options Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 10/14] pip_stress: Add JSON output feature Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 11/14] pi_stress: Prepare command line parser for long options only Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 12/14] pi_stress: Add JSON output feature Daniel Wagner
2021-03-05  7:34 ` [PATCH rt-tests v2 13/14] ssdd: Add quiet command line option Daniel Wagner
2021-03-05  7:35 ` Daniel Wagner [this message]
2021-03-05  7:41 ` [PATCH rt-tests v2 00/14] JSON cleanups and more tests updated Daniel Wagner
2021-03-05 15:29   ` John Kacur
2021-03-05 15:41     ` Daniel Wagner
2021-03-05 15:51       ` John Kacur

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=20210305073500.17926-15-dwagner@suse.de \
    --to=dwagner@suse.de \
    --cc=jkacur@redhat.com \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=williams@redhat.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).