From patchwork Fri Mar 5 07:35:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 394005 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5344C4332B for ; Fri, 5 Mar 2021 07:35:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8860A65015 for ; Fri, 5 Mar 2021 07:35:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229631AbhCEHfM (ORCPT ); Fri, 5 Mar 2021 02:35:12 -0500 Received: from mx2.suse.de ([195.135.220.15]:43782 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229602AbhCEHfJ (ORCPT ); Fri, 5 Mar 2021 02:35:09 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id AED40AD72; Fri, 5 Mar 2021 07:35:08 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH rt-tests v2 14/14] ssdd: Add JSON output feature Date: Fri, 5 Mar 2021 08:35:00 +0100 Message-Id: <20210305073500.17926-15-dwagner@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305073500.17926-1-dwagner@suse.de> References: <20210305073500.17926-1-dwagner@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org Write the test results as JSON output to a file. This allows to simplifies any parsing later on. Signed-off-by: Daniel Wagner --- 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 #include +#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 \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); }