From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 34A6AA00C4; Mon, 25 Jul 2022 18:36:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E5F24280D; Mon, 25 Jul 2022 18:36:00 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 4FAA741148 for ; Mon, 25 Jul 2022 18:35:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658766958; x=1690302958; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hJ0cmGTh9OsXMyI5rf+157EMkILCdCaBZf9lZ5yBuAM=; b=XymF1GER9XB1A3r4mSuHPrpLmQOS8HgJxKFSu00NY3WA4l4qZp3DWiBc ftuYxH+t2MDWEID+J2IgDwb3IC/65eRBUeJEVm9/8LGaxEuig0bpRLsp5 2seqSbJc9f/pNDXiAvXyga9GCIuN+rgTDKpW4w/cfekbwItJJopmTjYqJ wj5sMqzsGkOIYB2aEYeWImeLRVaqDygbvKpc7NXUpfL0Tgo0vqb2oMV35 FTcKyqeeGNSj0iFCqFa37igIeQHtwcdsEBkDdKLYisJ3XWtFci5BKZMPt JAWdliZwe0N9LG6rZ6hf4DFYkvcCf1fHfZyT/5gxxLtGbGGyMvAFCZ6ka A==; X-IronPort-AV: E=McAfee;i="6400,9594,10419"; a="274606800" X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="274606800" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2022 09:35:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="575121815" Received: from silpixa00401385.ir.intel.com (HELO silpixa00401385.ger.corp.intel.com.) ([10.237.223.47]) by orsmga006.jf.intel.com with ESMTP; 25 Jul 2022 09:35:56 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Ciara Power Subject: [PATCH v2 01/13] test/telemetry_json: print success or failure per subtest Date: Mon, 25 Jul 2022 17:35:30 +0100 Message-Id: <20220725163543.875775-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220725163543.875775-1-bruce.richardson@intel.com> References: <20220623164245.561371-1-bruce.richardson@intel.com> <20220725163543.875775-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org rather than just printing out success or failure at the end of the test only, print out "OK" or "ERROR" for each individual test case within the overall test. As part of this, ensure each case returns 0 on success and any other value on failure. Signed-off-by: Bruce Richardson --- app/test/test_telemetry_json.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/app/test/test_telemetry_json.c b/app/test/test_telemetry_json.c index 790181d316..748b7cfe5a 100644 --- a/app/test/test_telemetry_json.c +++ b/app/test/test_telemetry_json.c @@ -102,8 +102,10 @@ test_large_array_element(void) used = rte_tel_json_add_array_string(buf, sizeof(buf), used, str); printf("%s: buf = '%s', expected = '%s'\n", __func__, buf, expected); + if (used != 0) + return -1; - return strlen(buf) != 0; + return strncmp(expected, buf, sizeof(buf)); } static int @@ -117,20 +119,33 @@ test_large_obj_element(void) used = rte_tel_json_add_obj_u64(buf, sizeof(buf), used, str, 0); printf("%s: buf = '%s', expected = '%s'\n", __func__, buf, expected); + if (used != 0) + return -1; - return strlen(buf) != 0; + return strncmp(expected, buf, sizeof(buf)); } +typedef int (*test_fn)(void); + static int test_telemetry_json(void) { - if (test_basic_array() < 0 || - test_basic_obj() < 0 || - test_overflow_array() < 0 || - test_overflow_obj() < 0 || - test_large_array_element() < 0 || - test_large_obj_element() < 0) - return -1; + unsigned int i; + test_fn fns[] = { + test_basic_array, + test_basic_obj, + test_overflow_array, + test_overflow_obj, + test_large_array_element, + test_large_obj_element, + }; + for (i = 0; i < RTE_DIM(fns); i++) + if (fns[i]() == 0) + printf("OK\n"); + else { + printf("ERROR\n"); + return -1; + } return 0; } -- 2.34.1