From patchwork Mon Nov 27 14:00:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 119711 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp308692qgn; Mon, 27 Nov 2017 06:02:49 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ4dzfqCbQ4WDjdi3+vYTpMTTkpnM4Ie/RcYiLwk8MgzLnJcN8DUwTRLAUJGKI76xQTHGLq X-Received: by 10.55.20.105 with SMTP id e102mr59161616qkh.89.1511791369809; Mon, 27 Nov 2017 06:02:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511791369; cv=none; d=google.com; s=arc-20160816; b=CLmkC2H2s8oNZRsmhqkBK4M8jVLI+wW9GZz6dFCc1VQzp5CsaQy3BD2DenXtayy53m 5yd480J6LuRUHVa6PXx3J4qK0evT4LLLa0nHSGqy5VuQcLXKgNuOZAgIZxJMuIkr+CX0 xglAeGB5krx4wXuLRl6hmQ/Iir7K8xXflrhv5KF9BgUN1o4gYfg3trrQ0qu+/q2LK/Rc vnkkm3LHGhtw1UXYSKaiRht4lWDIHiB+sw9NQ+qsgiH1IrrYpdxYFQOheaR3vsLapohh heef8bY0VRg2Eo5Gw9oRjWl6Jzrma7zghigl/nPufQuJSZeSGHpkXY632sdrgfqvDf3v xZPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=E7Am8LYGpfxRiibg6s8RO/gvqCBlef5e77We9oXKO88=; b=HIKHPWwSZM7eVliPXvcO/xe7ZXsdcOMFKe6LG8HG4OY8vbyQgKU5D28qy5qK0Z5iK3 JPP2CX1btR9/5OX4mJoaWQ39eJg12hXItjn1ZFb6P/qOY7C6Nxg7yhk93EbCZ+aAku+K gPD7DxR1vqDJzrxJNTF5ENTbBwwfgytQG80ccWlvamt2z4hUhjxvaSxksw7kICwcR6l9 D/LTI7o+lcMMfAKYCr+VCNzejSwPKh232ZOwN34gBvJ0wWXgvpJAr23XA6WdvoDN6Brt MG3Jt1EhWCjaIUT3R3UOi1OlAhitnLRyFIko4EHCBMaBr2dE947lsVybyYzc2PfHsbhM qDPQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id t69si388458qka.111.2017.11.27.06.02.44; Mon, 27 Nov 2017 06:02:49 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 573FF60836; Mon, 27 Nov 2017 14:02:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 91E6A60688; Mon, 27 Nov 2017 14:02:23 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D110F606A7; Mon, 27 Nov 2017 14:02:17 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 4F025608DF for ; Mon, 27 Nov 2017 14:00:15 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 473AC1801C20 for ; Mon, 27 Nov 2017 17:00:12 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id bZt8PubUmo-0Cbibnpc; Mon, 27 Nov 2017 17:00:12 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VVd7ThpHX4-0Bj89XXw; Mon, 27 Nov 2017 17:00:11 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 27 Nov 2017 17:00:06 +0300 Message-Id: <1511791209-5993-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511791209-5993-1-git-send-email-odpbot@yandex.ru> References: <1511791209-5993-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 309 Subject: [lng-odp] [PATCH v4 1/4] test: build: enable cunit output to xml X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov Signed-off-by: Maxim Uvarov --- /** Email created from pull request 309 (muvarov:devel/master_shippable2) ** https://github.com/Linaro/odp/pull/309 ** Patch: https://github.com/Linaro/odp/pull/309.patch ** Base sha: 5329e5211c447b9b823149baf76112eedfeb07fb ** Merge commit sha: ff9199054bf3859c068a6c7702c0dfae9dd7c629 **/ .gitignore | 3 +++ configure.ac | 1 + doc/.gitignore | 1 + test/Makefile.inc | 3 +++ test/common/odp_cunit_common.c | 20 ++++++++++++++++++++ test/common/odp_cunit_common.h | 3 +++ test/m4/validation.m4 | 9 +++++++++ 7 files changed, 40 insertions(+) create mode 100644 doc/.gitignore diff --git a/.gitignore b/.gitignore index b9c61424a..75ba2ac86 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,16 @@ *.d *.gcda *.gcno +*.trs *.la *.lo +*.log *.o *.orig *.patch *.rej *.swp +*.xml *~ .deps/ .dirstamp diff --git a/configure.ac b/configure.ac index 95e316026..c4ce56e20 100644 --- a/configure.ac +++ b/configure.ac @@ -383,6 +383,7 @@ AC_MSG_RESULT([ Deprecated APIs: ${deprecated} debug: ${enable_debug} cunit: ${cunit_support} + cunit xml output: ${cunit_out_xml} test_vald: ${test_vald} test_perf: ${test_perf} test_perf_proc: ${test_perf_proc} diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 000000000..d7ec32eaf --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +!*.xml diff --git a/test/Makefile.inc b/test/Makefile.inc index f7c0da214..086100b17 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -17,6 +17,9 @@ INCFLAGS = \ AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS = $(CUNIT_CFLAGS) +if cunit_out_xml +AM_CFLAGS += -DTEST_CUNIT_XML +endif AM_LDFLAGS = -L$(LIB) -static diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c index 08bf1f264..34981b74e 100644 --- a/test/common/odp_cunit_common.c +++ b/test/common/odp_cunit_common.c @@ -1,3 +1,4 @@ + /* Copyright (c) 2014, Linaro Limited * All rights reserved. * @@ -7,6 +8,7 @@ #include "config.h" #include +#include #include #include "odp_cunit_common.h" #include @@ -14,6 +16,7 @@ static odph_odpthread_t thread_tbl[MAX_WORKERS]; static odp_instance_t instance; +extern const char *__progname; /* * global init/term functions which may be registered * defaults to functions performing odp init/term. @@ -291,13 +294,30 @@ static int cunit_update_suite(odp_suiteinfo_t *updated_sinfo) int odp_cunit_run(void) { int ret; +#ifdef TEST_CUNIT_XML + char name[255]; +#endif printf("\tODP API version: %s\n", odp_version_api_str()); printf("\tODP implementation name: %s\n", odp_version_impl_name()); printf("\tODP implementation version: %s\n", odp_version_impl_str()); +#ifdef TEST_CUNIT_XML + if (strlen(__progname)) { + snprintf(name, 255, "%s", __progname); + CU_set_output_filename(name); + } else { + /* forked processes do not have __progname */ + ret = readlink("/proc/self/exe", name, sizeof(name) - 1); + name[ret] = 0; + CU_set_output_filename(basename(name)); + } + + CU_automated_run_tests(); +#else CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests(); +#endif ret = CU_get_number_of_failure_records(); diff --git a/test/common/odp_cunit_common.h b/test/common/odp_cunit_common.h index 486a5ec51..6eaeed87d 100644 --- a/test/common/odp_cunit_common.h +++ b/test/common/odp_cunit_common.h @@ -17,6 +17,9 @@ #include #include "CUnit/Basic.h" #include "CUnit/TestDB.h" +#ifdef TEST_CUNIT_XML +#include +#endif #include #define MAX_WORKERS 32 /**< Maximum number of work threads */ diff --git a/test/m4/validation.m4 b/test/m4/validation.m4 index 65ba2aa2e..0dccd5d79 100644 --- a/test/m4/validation.m4 +++ b/test/m4/validation.m4 @@ -19,6 +19,14 @@ AS_IF([test "x$cunit_support" != "xno"], [cunit_support=no]) ])]) + +########################################################################## +AC_ARG_ENABLE([cunit_out_xml], + [AS_HELP_STRING([--enable-cunit_out_xml], + [include additional debugging code ] + [(set to 'full' to enable all --enable-*-debug-* options)])], + cunit_out_xml=yes, cunit_out_xml=no) + AS_IF([test "x$test_vald" = "xyes" -a "x$cunit_support" = "xno"], [AC_MSG_ERROR([Validation testsuite requested, but CUnit was not found])], [test "x$test_vald" = "xcheck" -a "x$cunit_support" = "xno"], @@ -27,6 +35,7 @@ AS_IF([test "x$test_vald" = "xyes" -a "x$cunit_support" = "xno"], [test "x$test_vald" != "xno"], [test_vald=yes]) AM_CONDITIONAL([cunit_support], [test "x$cunit_support" = "xyes"]) +AM_CONDITIONAL([cunit_out_xml], [test "x$cunit_out_xml" = "xyes"]) AM_CONDITIONAL([test_vald], [test "x$test_vald" = "xyes"]) AC_SUBST([CUNIT_CFLAGS])