From patchwork Thu Dec 21 12:07:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Van Haaren, Harry" X-Patchwork-Id: 32560 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C921F1B260; Thu, 21 Dec 2017 13:07:56 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 233FA1B21F for ; Thu, 21 Dec 2017 13:07:54 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Dec 2017 04:07:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,435,1508828400"; d="scan'208";a="4501089" Received: from silpixa00398672.ir.intel.com ([10.237.223.128]) by orsmga007.jf.intel.com with ESMTP; 21 Dec 2017 04:07:52 -0800 From: Harry van Haaren To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, Harry van Haaren Date: Thu, 21 Dec 2017 12:07:29 +0000 Message-Id: <1513858050-77961-1-git-send-email-harry.van.haaren@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH 1/2] test: use env variable to run tests X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" With this patch the test binary checks the DPDK_TEST environment variable and if set, the contents of the var are inserted on the test app command line, and run. Signed-off-by: Bruce Richardson Signed-off-by: Harry van Haaren Reviewed-by: Pablo de Lara --- Note that this patch is the combination of multiple patches that were developed on the dpdk-next-build tree, however the changes target code for mainline DPDK. As such, the relevant parts of the following commits were merged into this single patch that targets mainline: - 32529 test: use env variable to run test if set - 32555 test/test: fix missed failures when running meson test - 32556 test/test: add return value to mark unit tests as skipped --- test/test/commands.c | 1 + test/test/test.c | 18 ++++++++++++++++++ test/test/test.h | 1 + 3 files changed, 20 insertions(+) diff --git a/test/test/commands.c b/test/test/commands.c index 4097a33..6649cfc 100644 --- a/test/test/commands.c +++ b/test/test/commands.c @@ -103,6 +103,7 @@ static void cmd_autotest_parsed(void *parsed_result, ret = t->callback(); } + last_test_result = ret; if (ret == 0) printf("Test OK\n"); else diff --git a/test/test/test.c b/test/test/test.c index 0e6ff7c..49a61ce 100644 --- a/test/test/test.c +++ b/test/test/test.c @@ -102,6 +102,8 @@ do_recursive_call(void) return -1; } +int last_test_result; + int main(int argc, char **argv) { @@ -140,6 +142,20 @@ main(int argc, char **argv) if (cl == NULL) { return -1; } + + char *dpdk_test = getenv("DPDK_TEST"); + if (dpdk_test && strlen(dpdk_test)) { + char buf[1024]; + snprintf(buf, sizeof(buf), "%s\n", dpdk_test); + if (cmdline_in(cl, buf, strlen(buf)) < 0) { + printf("error on cmdline input\n"); + return -1; + } + + cmdline_stdin_exit(cl); + return last_test_result; + } + /* if no DPDK_TEST env variable, go interactive */ cmdline_interact(cl); cmdline_stdin_exit(cl); #endif @@ -231,6 +247,8 @@ unit_test_suite_runner(struct unit_test_suite *suite) printf(" + Tests Failed : %2d\n", failed); printf(" + ------------------------------------------------------- +\n"); + last_test_result = failed; + if (failed) return -1; diff --git a/test/test/test.h b/test/test/test.h index 08ffe94..2e90184 100644 --- a/test/test/test.h +++ b/test/test/test.h @@ -218,6 +218,7 @@ struct unit_test_suite { }; int unit_test_suite_runner(struct unit_test_suite *suite); +extern int last_test_result; #define RECURSIVE_ENV_VAR "RTE_TEST_RECURSIVE"