From patchwork Sun Jan 14 23:59:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124444 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp502248lje; Sun, 14 Jan 2018 16:01:08 -0800 (PST) X-Google-Smtp-Source: ACJfBovrs2iBZq8BKsmvIAjpTcMMmISR2pbxuKiw5a27MMhLidbOBoy3X+CI+OFX71qkdZAMVC7l X-Received: by 10.237.36.205 with SMTP id u13mr6906165qtc.135.1515974468457; Sun, 14 Jan 2018 16:01:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974468; cv=none; d=google.com; s=arc-20160816; b=itmBPwh3pnjBjinzcEtenRxX9tzOBEnNSWSjzrFhnwJpFBQO5MQx1sWrdzntj1DCF8 UZWu/AGOwngtjNuul9Tm7DO+iFnPwBzK6jm5ONSM6UYE32bbTdW48XF1V1+yKbsm37wf hDALl3LrJYuGeNegHsu9z6cOucfGHpYDPH5/FseuZdnaU5RUGYJ3AurJ91zcOfTmG3dO vZz00gzuFxeqiKnC57QoaksbGUbMYcQA6B2YlNg0aqZnplOgl1Cf126EsRFz/dVXjPdz jUY/3AOCSk9yVG5CnYP/cWUAcEB1g0LfR6lYT4wJMZQStOly52/1ArdqCOBd3efD9a26 6JyQ== 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=7Z/xGfn3YfpvWU+0k1Uofw36y0mT7lvvxzlNqD9O+2I=; b=0hbsMDia5UcIZKFR31Hu4zAP3WoRqh4ImBwyUBWY8XLmysAD6PiPRZQ5ZZSalJoYZm 8OxYk5GMrSfI3IYBEoonhoQV8+1vIkGIBgsKmyLJwOA2746ivrA5GOHR7MfEsoTxdBHx /FQV8GVdNLOLBmaKAosGs4FBLj4SYj7xnSjQuBH4PbNF7ALNbMb0tGKdBR2ko0fqxzlr nAfuvv64bhPLMvohB/Sh36oDcyA1FHAWzyg7djYjKbt6Z43OwITZPBdTtdtTLecYRZJA 1A8GsyWWN24YIKSCtzOytwuCIxedmHSjTte+O8Aaw8Wv/MuuaEw3g5LucMmf7OwSYr5+ bwBw== 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 u2si1945258qtj.293.2018.01.14.16.01.08; Sun, 14 Jan 2018 16:01:08 -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 23C196174C; Mon, 15 Jan 2018 00:01:08 +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_H2 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 42733616D9; Mon, 15 Jan 2018 00:01:02 +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 C50876170E; Mon, 15 Jan 2018 00:00:58 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id D74B561518 for ; Mon, 15 Jan 2018 00:00:27 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 385A06A8319A for ; Mon, 15 Jan 2018 03:00:26 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id sNCCFXH0a5-0Q24oMNG; Mon, 15 Jan 2018 03:00:26 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-0Je8MBvw; Mon, 15 Jan 2018 03:00:19 +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, 15 Jan 2018 02:59:59 +0300 Message-Id: <1515974412-25863-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 1/14] helper: link against libpthread and libodp-linux 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: Dmitry Eremin-Solenikov libodphelper.so uses symbols from libpthread and libodp-linux.so, link it aganst those libraries. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ helper/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helper/Makefile.am b/helper/Makefile.am index ee1c17d6d..ebb67346c 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include +AM_CFLAGS = $(PTHREAD_CFLAGS) AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' @@ -60,4 +61,6 @@ __LIB__libodphelper_la_SOURCES += \ linux/thread.c endif +__LIB__libodphelper_la_LIBADD = $(PTHREAD_LIBS) $(LIB)/libodp-linux.la + lib_LTLIBRARIES = $(LIB)/libodphelper.la From patchwork Mon Jan 15 00:00:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124445 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp502355lje; Sun, 14 Jan 2018 16:01:40 -0800 (PST) X-Google-Smtp-Source: ACJfBos4VdETmv0opFex2YImC8qJDNQiTdYd8vFnIpMSqEiiEDyx/TtAL9OoLgGBcIaIOja3xSHB X-Received: by 10.237.56.103 with SMTP id j94mr46909849qte.324.1515974500621; Sun, 14 Jan 2018 16:01:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974500; cv=none; d=google.com; s=arc-20160816; b=KZL8MfRY+owhMPdpgqQnhHoB+FlXJdM9UKr2oFQ4qMNbtoIISLpTgn1ZEzNKRwc1GJ 8VEl2rHraBOrVg9QzPXGf8ZRNFzs3BVxUjLKUpAjFRNgWnaXN4BHg4m6IyVSkavblieO JjACLnuyPpTW2NCuxH1faWyw/ezZ0YzXlvSKQcBnT7z7GljyNL0O2Gcw1eFp5T+hnrxN kETS3PyP7BypyaNNQCw84M13wCH34nIeHtfgum/gZeqGUVPDWrjocQVVoW7iBO0Z3FrO m7ZLBBp/J7Gsg8GmouEiG8LTYKUjxV80A2AYAUc1sJfx5LR+eJff3SxqItm1xrRcA0te OX6A== 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=ha1XummdFhc0RwhchF+0/oEi14gcwmyWrkMBO7EfZBQ=; b=gnXlS1iFAm2t6mVwcFAnXfD+fH8ms2O1UE0pe9u8kYMQzIssE/lc5/zRAEOAeLxB0T wBjjJyfX7ffS17iTAwKdYvyX3V+8ftIopDOGcfkOU7U0tDGNtkr0qKYW/fvfsfTv4tOW O1atKbkUj6pwjSzY2Ot2YRTXwQQE7jyv+YITLr99+2nE2DxpzbQ2Ncf0ka3hiR9xjBa7 rh4YicXadqJXh7kl2D3y2ttKro5ab6ztZzV5P8KZs7SGAmH9dxDZvCJVN6GJpLLXH6jn AOyqtKHqj3cNgkzFC+u39/ANrfiLVK54WJsIggfNy1NEB2KNUitdtx4E6WyCr45MwbPH G8pw== 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 c124si19186149qkd.318.2018.01.14.16.01.40; Sun, 14 Jan 2018 16:01:40 -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 4EDC961735; Mon, 15 Jan 2018 00:01:40 +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 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 A4AAE61731; Mon, 15 Jan 2018 00:01:04 +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 AC2EF61512; Mon, 15 Jan 2018 00:00:59 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 0005961502 for ; Mon, 15 Jan 2018 00:00:33 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 961A1181C68 for ; Mon, 15 Jan 2018 03:00:32 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id S1a9u5uG6M-0WMui2kJ; Mon, 15 Jan 2018 03:00:32 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-0Qe8gi1r; Mon, 15 Jan 2018 03:00:26 +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, 15 Jan 2018 03:00:00 +0300 Message-Id: <1515974412-25863-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 2/14] doc: add missing user-guide images to Makefile.am 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: Dmitry Eremin-Solenikov Omitting those images in Makefile.am made them disappear from distribution tarball resulting in an improperly-built documentation files. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ doc/users-guide/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index b2ebd4d4f..7be32ddc1 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -32,6 +32,12 @@ IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/pktio_fsm.svg \ $(IMAGES_DIR)/pktout_direct_send.svg \ $(IMAGES_DIR)/pktout_queue_send.svg \ + $(IMAGES_DIR)/ref.svg \ + $(IMAGES_DIR)/refpkt1.svg \ + $(IMAGES_DIR)/refpkt2.svg \ + $(IMAGES_DIR)/refpktmulti.svg \ + $(IMAGES_DIR)/refpktsingle.svg \ + $(IMAGES_DIR)/refstatic.svg \ $(IMAGES_DIR)/release_git.svg \ $(IMAGES_DIR)/segment.svg \ $(IMAGES_DIR)/simple_release_git.svg \ From patchwork Mon Jan 15 00:00:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124446 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp502486lje; Sun, 14 Jan 2018 16:02:13 -0800 (PST) X-Google-Smtp-Source: ACJfBoswTHu5sUXRV+xuO6FvtBJxtq5RuAqkxvBbY2XY+0tUzgMkd5CI2tCTvzxpFwfHjv7dT07W X-Received: by 10.200.48.166 with SMTP id v35mr19392633qta.296.1515974533272; Sun, 14 Jan 2018 16:02:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974533; cv=none; d=google.com; s=arc-20160816; b=b/ulaMSxusGvP4A/dzqLXl7VNLdyIB502Zd2JkrM4nU5bkKCMiHpqyW0g2p6zx7fyt 3Kd7FJBnF+W5AtbUpOo3fxJNpSkPWD204UiH9MYWQnygpsn5hEbeicQyui1BlbIS96B3 BNvYH9oRvS3zqfPp88qrGTnVGqAyzcH+yraQuPFKPyDlkea3Aa1b8vqiMUOP762nQDT7 zzAJDEOtek2DQVuj+L4YiMDseg2XiAk625LGmDfQ7AQmhCCyMlUzHkkwpd/h6xkbrXZd de/5A3ZM6y+D+WyyiPk9hX0AvVr1XhHJnLkZ8YMEXEOEio8S+tmb8FoN+HGy+Fjrl4gw VSsg== 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=IHBxBiW/vFLg7G2cwuXmfhqb05gTLYlreEavo880tMs=; b=Oy6JfPIKaCIklj1tKADcYaxn5i2DVEYd7pMFSPIW9UxYHZENOvYrJkvgZ3N5w2h2Ru 9pjNj4dHzqEbre5OdI+ihzsrW7jGmdbgUuUzRRwEx5tq4WfaZ1bcWyFvRS2vQu4GHH3o FAkPH7cx5E3aehU2sCmDqSUA3TT4fbe5Pkmbb7UOVRFptjCBWaFMof0LGoIYh5YODj9X fX/KiKPUZ0rz2yNKgfqv+Gdk4CSQeIzkR8hugVOb5brHUsf2+Z6fROUyEpfSIO4QsvPR xSmYElZGPFvUcIGoBG4ei1UPoHuz+TwSzD+liza+iHqmNLHQx+M64Nz4sXF2UjDqxePo Zryw== 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 e44si484098qtf.198.2018.01.14.16.02.13; Sun, 14 Jan 2018 16:02:13 -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 EB43E6175D; Mon, 15 Jan 2018 00:02:12 +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 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 376136174D; Mon, 15 Jan 2018 00:01:08 +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 5E11761512; Mon, 15 Jan 2018 00:01:01 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 730D4616D9 for ; Mon, 15 Jan 2018 00:00:58 +0000 (UTC) Received: from mxback3g.mail.yandex.net (mxback3g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:164]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 0F3E81242F24 for ; Mon, 15 Jan 2018 03:00:57 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Jb7zFCuOHy-0ub4oXZr; Mon, 15 Jan 2018 03:00:57 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-0WemgGGY; Mon, 15 Jan 2018 03:00:32 +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, 15 Jan 2018 03:00:01 +0300 Message-Id: <1515974412-25863-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 3/14] doc: add missing implementers-guide images to Makefile.am 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: Dmitry Eremin-Solenikov Omitting those images in Makefile.am made them disappear from distribution tarball resulting in an improperly-built documentation files. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ doc/implementers-guide/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 07ee141c8..c407339e2 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -2,10 +2,12 @@ include ../Makefile.inc SRC = implementers-guide.adoc TARGET = implementers-guide.html +IMAGES = $(IMAGES_DIR)/abi_llvm.svg \ + $(IMAGES_DIR)/abi_traditional.svg -EXTRA_DIST = $(SRC) +EXTRA_DIST = $(SRC) $(IMAGES) doc_DATA = $(TARGET) -$(TARGET): $(SRC) +$(TARGET): $(SRC) $(IMAGES) CLEANFILES = $(doc_DATA) From patchwork Mon Jan 15 00:00:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124447 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp502755lje; Sun, 14 Jan 2018 16:03:25 -0800 (PST) X-Google-Smtp-Source: ACJfBouh7pAtH2MVE1opAEtShqJ/CvZX0vDsUFT3H7u1neGtRkM84Q6/hpciv5vy+zxODN+3XL+M X-Received: by 10.55.167.137 with SMTP id q131mr20941833qke.102.1515974604896; Sun, 14 Jan 2018 16:03:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974604; cv=none; d=google.com; s=arc-20160816; b=OVyFCSyc5dkDBbOCgu1gGdyiDDs7wNDVQs2mwd+LMB0elSPl6/YqqagisPH43UxniM fm3+zj7tnI5mjdXIn4MBxF8rF6/6Vu7DrgpU1FhsDpo2C+65+IEo0P1mJPL4d0k6ua2y b+Jy+j5la/fjY5/QMtKpVy8YdeZSorWDNdnGri1fmBdyZWy6QR/9jEfrnVFIsq0WqHlF 7LdBKnVXiDhJhEjuhiPEBorSO+etRuAylSN0It+TkyDI+VJMn3ktOuoTCaa98DPww2gB dhgKoqdwmS61kf77dBsHQDti54Z5ZRW5AVOLqYfkL2p5e9k0SFG1qfFFkTTsvq2/LaQG gM/w== 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=7BAuuoGLyG+S2L/qXXlJnl70KcmFb7imX1WzKzRLJK0=; b=MJyPxDZU3jBPGu1Zl4B4ewEE94mju51Duu2+OvaHDwM4OfmxwmBN6w5Qfm4c26nzt4 XLmdWdYAOXyYUQAAcsujKep7K1B2mPMS7UsIJkqvDZkzQ91c5loIg/23jyzhGfaaxmNw 8hHmcI/M1Khzv63w+SHocmIdKJ0DWkubH7nYVXF/o/jgB8CM7AvN3R5G51UGLlJpzeV9 xmD2laWCyU9QhCLfqh7VXOq8CC70xDtuHDb7j5uLa3uFMMbcHkuy4LLEFv/sK9gbh8NR bHtyGZDB8Gw6UDLd/5uYIbibEvLMrKSt0rTdrcLPi9PLqzU7IPH23PbzjwsiUa1hGrqP ipYA== 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 o14si580598qke.428.2018.01.14.16.03.24; Sun, 14 Jan 2018 16:03:24 -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 8D2626174F; Mon, 15 Jan 2018 00:03:24 +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 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 2226C61735; Mon, 15 Jan 2018 00:01:42 +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 B26BA61714; Mon, 15 Jan 2018 00:01:37 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 6E24261714 for ; Mon, 15 Jan 2018 00:01:04 +0000 (UTC) Received: from mxback3g.mail.yandex.net (mxback3g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:164]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 6C66D181C6F for ; Mon, 15 Jan 2018 03:01:03 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id eZxZSkq5kw-13bKurL8; Mon, 15 Jan 2018 03:01:03 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-0veWEeJg; Mon, 15 Jan 2018 03:00:57 +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, 15 Jan 2018 03:00:02 +0300 Message-Id: <1515974412-25863-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 4/14] performance: odp_crypto: correct typo 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: Dmitry Eremin-Solenikov Receieved -> Received. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ test/performance/odp_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 0cbc2754e..761cc8cff 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -612,7 +612,7 @@ run_measure_one(crypto_args_t *cargs, if (cargs->debug_packets) { mem = odp_packet_data(out_pkt); - print_mem("Receieved encrypted packet", + print_mem("Received encrypted packet", mem, payload_length + config-> From patchwork Mon Jan 15 00:00:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124448 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp502876lje; Sun, 14 Jan 2018 16:03:56 -0800 (PST) X-Google-Smtp-Source: ACJfBovIQkiTp//6l1fa17kbHfwrVLzyfoZrQHdSw61K8C7TXEU9hDPOLfwXr1YhkdVK9vzTlltn X-Received: by 10.55.138.68 with SMTP id m65mr34845791qkd.166.1515974636112; Sun, 14 Jan 2018 16:03:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974636; cv=none; d=google.com; s=arc-20160816; b=y3Z2+rWS4CrZIHiNrb2YsweQAkni+qTcvjMU1TZ+CRBx3shRZaZ//B/pZHcOcBFC+p imZIQWPA7KG+bhpsblTGHoiW5p1RxMYeA38uUsaxwjDvWfcd+USw5ad4i5vlchaWoWna oXKVHjfStNrvIHvAPRwyDqb7HRlpvIdWCJ98AFdMQqJLpCvhbri9Bt+vDqLdiFGWbvHW JGg98LrqjFjpVy+dgNXPh3Qt0LCF5zchBm9ukLHCCt25gyiCyEPWGxLB18Q7118wE19+ m5+uJjN/lFf9fELu7FqoZDdWznCO28aPo2Tnxf1tjw8Eo4+4U1DBAVIGZcdJ8wn0ary5 UFcQ== 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=YbG7odz7uPTv7Kn1pRBdAh8DT7JEKHha7H+dYSt8J0E=; b=uGxhnH29PGMe4c/yswfHK22cxjWtTZCcPGixSFnl9LOY+NLVTj0BKqPkPOQ+HzaDQY 7CUK5NPBElcEnau85lU7Q0Uk42WJzKrIs9+u596+bqLnICrFmP6dSIlt1DN5fdxE1PQ/ yvbm/l+hp9nTHqebaQxvvmg9YYJJTkecUqHN4PEnPXcHYZzg1t3J7OkWVnqzZpggDq32 YHNtYazTRA+DIUKGStAhQbcahTK6A141m54c6lH6FEDIG2QAUF9v+ohr997vZucwKmwO n71i/RtV67GzszesxfXYuEKVEE0Ya3+MzsHdnuJfW/2vRtPejGD0RlnWcLcMspKRwurl EKIQ== 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 48si1577056qtu.321.2018.01.14.16.03.55; Sun, 14 Jan 2018 16:03:56 -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 CBD536176D; Mon, 15 Jan 2018 00:03:55 +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 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 B1E396175A; Mon, 15 Jan 2018 00:02:12 +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 A961F6175B; Mon, 15 Jan 2018 00:02:07 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id EADF5606B5 for ; Mon, 15 Jan 2018 00:01:11 +0000 (UTC) Received: from mxback10j.mail.yandex.net (mxback10j.mail.yandex.net [IPv6:2a02:6b8:0:1619::113]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 0FD3E781A41 for ; Mon, 15 Jan 2018 03:01:10 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback10j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id HogZgCDnir-19cWmOas; Mon, 15 Jan 2018 03:01:10 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-13eWIFgh; Mon, 15 Jan 2018 03:01:03 +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, 15 Jan 2018 03:00:03 +0300 Message-Id: <1515974412-25863-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 5/14] linux-gen: don't pass DPKD_LIBS for dynamic linking with libodp-linux 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: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ platform/linux-generic/libodp-linux.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/linux-generic/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in index 220dbc9c6..962a4f78f 100644 --- a/platform/linux-generic/libodp-linux.pc.in +++ b/platform/linux-generic/libodp-linux.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libodp-linux Description: The ODP packet processing engine Version: @PKGCONFIG_VERSION@ -Libs: -L${libdir} -lodp-linux @DPDK_LIBS@ +Libs: -L${libdir} -lodp-linux Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_PMDS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ Cflags: -I${includedir} From patchwork Mon Jan 15 00:00:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124449 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp502983lje; Sun, 14 Jan 2018 16:04:37 -0800 (PST) X-Google-Smtp-Source: ACJfBosOWIaE4m1ANS5GJRjq0QvxDRjn+bT8n1Ify8o3EFXTg6ePTXevSMJtwGQI8peV/6H7D0TQ X-Received: by 10.237.36.152 with SMTP id t24mr14551351qtc.136.1515974677606; Sun, 14 Jan 2018 16:04:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974677; cv=none; d=google.com; s=arc-20160816; b=vIvxtHV+NwmFVHtUvUPCWX4+6IqK1Uxu6zaC+seYVjrXKvayvM6hSBxGE7Mx9u/Elq Cz6K5uBdPuyFWEVCg+qugv83HaKBKRPWQTGSOxz62F7VZgJfXt9F3oQH4md8Iill/vxQ v2tCWCh6ugadIBa2rOKXgri5NNhVVpHM4Uq2fSlOwcj9R/UMmSAmGppdS0IgIkoFOyGm +gtvvgwc6L/EPg2VITlkqNq8SrS0Ou9+B1VeourvUaOzYhDYEtDHEmFnzyyUY2c3ZPTF JtcMXWBhFB870f5ZlvGRlZGrFCqW9kym5bEj5tGsKqnP5yixaAntilhY5F8HMN0w/RrN 4G7Q== 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=H0pFuFGrx6SMmAlWhvuSyfM3fKs6SdkgUX0p5uglAcA=; b=JqiQsmTbNgfsh6mCXWyeLgouHmrdPHfZv0TD4MmJ1WSkRLIpeQdVJuMxQFzoWMzXah mvII4YaSHI7HblKRk4/afPWgp+FwlCUoAy7g2ouSwZLISoj3/vNRrbeSyMBs/al/jPI2 csg624oR0q0i6H0U9TNKCix8dym2pF9AQhEwgI/bRTKXHW77Z2MesH6lhBGhHk9YibZ1 qbo9WHFUuAn0fsPyDboNW+zElGQW/eJPbS0W8pTHPMZ8fO0E0kevc0eFJGVij48p+XaO n7832svjv2nPi6LxRTyMnrcJC8iuREWKa/HRawAH8Y530T/4pIJB0PmKTpnhgz5zuS9m 5vnA== 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 z185si10566593qkb.254.2018.01.14.16.04.37; Sun, 14 Jan 2018 16:04:37 -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 3564361781; Mon, 15 Jan 2018 00:04:37 +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 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 283EC6175D; Mon, 15 Jan 2018 00:02:31 +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 DCA3C6175B; Mon, 15 Jan 2018 00:02:26 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id DAD6D6174E for ; Mon, 15 Jan 2018 00:01:17 +0000 (UTC) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) by forward106o.mail.yandex.net (Yandex) with ESMTP id D8E76781A12 for ; Mon, 15 Jan 2018 03:01:16 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 9KzFoc5Fo4-1GuaFAdr; Mon, 15 Jan 2018 03:01:16 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-1Aeirnei; Mon, 15 Jan 2018 03:01:10 +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, 15 Jan 2018 03:00:04 +0300 Message-Id: <1515974412-25863-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 6/14] example: add missing libraries to LDADD variables 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: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ example/ipfragreass/Makefile.am | 2 ++ example/ipsec/Makefile.am | 1 + example/ipsec_api/Makefile.am | 3 +++ 3 files changed, 6 insertions(+) diff --git a/example/ipfragreass/Makefile.am b/example/ipfragreass/Makefile.am index fa7d5c8bd..b98e066f8 100644 --- a/example/ipfragreass/Makefile.am +++ b/example/ipfragreass/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/example/Makefile.inc +LDADD += $(ATOMIC_LIBS) + bin_PROGRAMS = odp_ipfragreass odp_ipfragreass_SOURCES = odp_ipfragreass.c \ diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index 85905ffa7..eba9b8bda 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) bin_PROGRAMS = odp_ipsec diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 847326fc0..14bc5dd66 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/example/Makefile.inc +AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) + bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ From patchwork Mon Jan 15 00:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124450 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp503114lje; Sun, 14 Jan 2018 16:05:22 -0800 (PST) X-Google-Smtp-Source: ACJfBouxSNnmYKt5LEAnnWG7sphx3r0G/unnVMHvzxD5Nza/k/1jpvs7WoB91ckNqKj29xI54Frh X-Received: by 10.55.123.71 with SMTP id w68mr47914820qkc.175.1515974722454; Sun, 14 Jan 2018 16:05:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974722; cv=none; d=google.com; s=arc-20160816; b=a8NXwD2O1ckBXZ6fi8jk6mDL4PGZRKnGGsV+K1h7TQqjtdd8A9SVW7rjgsi9Lkt1HC wiYFnhV7/URmKPpeYCZCo1reivYXIexyrkqv6IKbD++xS3xUIhBmFCXyQ78xyc2dLVQG D5GcIeT9ip/Kp3SoBCFYpf413vi9X26XI2WjgizP6TeCGUenSb9adG6M9ASmhrIQRjGL IwUhmosZQRIzAOhX/p3tS0/IoGmXeRFUTFJz9EopkWyv+s/JAgHK3/6wQeBGgX3pMNcl uk1EnjfiRH+xF5Im344iYrSgF2E+LKM8UDJfjBlI9/4cfBNW9ixErFW0jih0/adNPzPp sF5g== 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=x1ED4BmwiYxv9EbpliAWw50lfnX3EF1T484Ii1uKdOk=; b=YToLM+7cZwXs9JZYdQQfoWy0sD3e18Zx7d0IrITA6UGrTfntNA07bsHa13/ghKHRlH GE2rqw99BCUgkTMO/UmXv4UD0K7If5q1F2V121GA+Idn3boTO5bZZnq5zZoTj7kgehBb SVxWH/Cqgyd/mzX2wpC0JA8buYevNzZTGIxy69geiwvJtEPIKD6MlSq2vcBnBhE9QclZ hZyOc8lcNq/32S7ZZi655hnA+lmM0FsvRZqtgEznOROGd0oRR7jjUGbPuIXP/iyGN47C Phy4UiO7L7yB7QrnFGzB8IlIs4RO0h1ppbe057MO+ZjB+6Em4ZxKpO/RrsEqqKTqHZOa HWMw== 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 w12si626439qtg.370.2018.01.14.16.05.22; Sun, 14 Jan 2018 16:05:22 -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 0A93561786; Mon, 15 Jan 2018 00:05:22 +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_H2 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 CC34861749; Mon, 15 Jan 2018 00:03:03 +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 52B816174C; Mon, 15 Jan 2018 00:02:54 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id DE7B6616E5 for ; Mon, 15 Jan 2018 00:01:41 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 8F79C2A20FF5 for ; Mon, 15 Jan 2018 03:01:40 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id oF3FPY22LI-1eaGRvrE; Mon, 15 Jan 2018 03:01:40 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-1GeuCDYC; Mon, 15 Jan 2018 03:01:16 +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, 15 Jan 2018 03:00:05 +0300 Message-Id: <1515974412-25863-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 7/14] helper/tests: use common Makefile.inc for tests 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: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ helper/test/Makefile.am | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 8eee643be..662d6c758 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,26 +1,4 @@ -TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} - -LIB = $(top_builddir)/lib - -#in the following line, the libs using the symbols should come before -#the libs containing them! The includer is given a chance to add things -#before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la - -INCFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/helper - -ODP_PLATFORM=${with_platform} - -AM_CPPFLAGS = $(INCFLAGS) -AM_LDFLAGS = -static +include $(top_srcdir)/test/Makefile.inc EXECUTABLES = chksum \ cuckootable \ From patchwork Mon Jan 15 00:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124451 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp503272lje; Sun, 14 Jan 2018 16:06:14 -0800 (PST) X-Google-Smtp-Source: ACJfBos0rRUgwW1C4LpsF0lzN3/Jrem7W2hRudoXJjSQogKCodmVoiQzkxOr4b8pkL7tpEnoufiq X-Received: by 10.55.25.146 with SMTP id 18mr44523218qkz.214.1515974774655; Sun, 14 Jan 2018 16:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974774; cv=none; d=google.com; s=arc-20160816; b=wUkAhha9dO8u66W0WHprPVVxZzzhmnbprNq7f8OPNjybRvOZqJdoj4TffLz+wjmeyM cPzC5em9y1cVW6IOdE602qpAl+yGSCr1OrzE5d/5fR+Mp6AqOXcZldG7+JAIL1Q4dKbo bpQntosAxabW9aRt871yQNfUlRICgNObeclRkqcLyuNU7zRE1w8acdACD7ydtgmGX1du ivQyKzxsN372DWe/wVNm8pudK5m0DgMk5rIiO8LZ78hJKMCMqHLZSglzCVKKSEjkrAeh 5i+3UBVxER9JwgezRHnKib4y/KWmd/0QOdu/BraXNW3KjJ+/sitrc26t+Mmp0XnZF4sA WaEw== 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=jT8FP7lyylNCy+FwE/SRubRbYcCElHS1d0mdNlH64/A=; b=MbmEks4usA4ecJAirF5ZKvN28AcmaV/RlOxAOOR595+Rl4Qyw/jXqGOolTm9gnJPUk hoeaBcdZHrMZ/htiB4UaDrI/ofxWYC3nU3lMM96znaMJE2QyMvyQrkMX03B+aBilt7fX jMH864eP5EyOo9Bb+2my5XL/T/ZCJ+XeI0vnAy+U5pvT4Vmgd4jkZ8qWtEiYRqUfxTL5 EB2YTOwe24maV/wmTUC9SwmfB3Qd3NAeJ1IT1irZMo+tTOxLBa95v8LWp2BsUAtDzMRd 3URW7bZE1/fCl/U/7eCg3HhVX+Uy/UuZ+iV9+RryYiv1z0oDn3qU8/ceUMSWQ9DdoAH9 Vklg== 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 m16si14820097qkh.14.2018.01.14.16.06.14; Sun, 14 Jan 2018 16:06:14 -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 50EEA61796; Mon, 15 Jan 2018 00:06:14 +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_H2 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 7317D6174C; Mon, 15 Jan 2018 00:03:57 +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 2C7FD61772; Mon, 15 Jan 2018 00:03:51 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 72C42616F3 for ; Mon, 15 Jan 2018 00:02:05 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 345E851029E2 for ; Mon, 15 Jan 2018 03:02:04 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YpACo8ss73-242G7l27; Mon, 15 Jan 2018 03:02:04 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-1eeiCqgn; Mon, 15 Jan 2018 03:01:40 +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, 15 Jan 2018 03:00:06 +0300 Message-Id: <1515974412-25863-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 8/14] test, linux-gen: use common test/Makefile.inc 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: Dmitry Eremin-Solenikov Populate test/Makefile.inc with more variables, allowing us to drop platform test/Makefile.inc. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ platform/linux-generic/test/Makefile.inc | 22 ---------------------- platform/linux-generic/test/ring/Makefile.am | 4 +--- .../linux-generic/test/validation/Makefile.inc | 1 - .../linux-generic/test/validation/api/Makefile.inc | 2 +- .../test/validation/api/shmem/Makefile.am | 6 ------ test/Makefile.inc | 9 +++++++++ test/validation/api/Makefile.inc | 11 ----------- 7 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 platform/linux-generic/test/Makefile.inc delete mode 100644 platform/linux-generic/test/validation/Makefile.inc diff --git a/platform/linux-generic/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc deleted file mode 100644 index dd21917eb..000000000 --- a/platform/linux-generic/test/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -# The following definitions may be used by platform tests that wish to -# build specific ODP applications, (i.e those whose do more than validation -# test wrapping) - -AM_LDFLAGS = -static - -AM_CFLAGS = $(CUNIT_CFLAGS) - -LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la -LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) - -INCCUNIT_COMMON = -I$(top_srcdir)/test/common -INCODP = \ - -I$(top_builddir)/include \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/test diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 376047559..95e5e87f4 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -1,4 +1,4 @@ -include ../Makefile.inc +include $(top_srcdir)/test/Makefile.inc test_PROGRAMS = ring_main ring_main_SOURCES = \ @@ -6,6 +6,4 @@ ring_main_SOURCES = \ ring_suites.c ring_suites.h \ ring_basic.c ring_stress.c -ring_main_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/include \ - $(INCCUNIT_COMMON) $(INCODP) ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/platform/linux-generic/test/validation/Makefile.inc b/platform/linux-generic/test/validation/Makefile.inc deleted file mode 100644 index b9030850c..000000000 --- a/platform/linux-generic/test/validation/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/platform/linux-generic/test/Makefile.inc diff --git a/platform/linux-generic/test/validation/api/Makefile.inc b/platform/linux-generic/test/validation/api/Makefile.inc index c47217d1a..cda6237ea 100644 --- a/platform/linux-generic/test/validation/api/Makefile.inc +++ b/platform/linux-generic/test/validation/api/Makefile.inc @@ -1 +1 @@ -include $(top_srcdir)/platform/linux-generic/test/validation/Makefile.inc +include $(top_srcdir)/test/validation/api/Makefile.inc diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index 131a511be..f75cbc976 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -10,13 +10,7 @@ shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt #shmem_odp1 and shmem_odp2 are the 2 ODP processes: shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h -shmem_odp1_CFLAGS = $(AM_CFLAGS) \ - $(INCCUNIT_COMMON) \ - $(INCODP) shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h -shmem_odp2_CFLAGS = $(AM_CFLAGS) \ - $(INCCUNIT_COMMON) \ - $(INCODP) shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/Makefile.inc b/test/Makefile.inc index f7c0da214..d4d74c25e 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,5 +1,13 @@ LIB = $(top_builddir)/lib +COMMON_DIR = $(top_builddir)/test/common + +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la + +LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la +LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la +LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la + #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. @@ -16,6 +24,7 @@ INCFLAGS = \ -I$(top_builddir)/include AM_CPPFLAGS = $(INCFLAGS) +AM_CPPFLAGS += -I$(top_srcdir)/test/common AM_CFLAGS = $(CUNIT_CFLAGS) AM_LDFLAGS = -L$(LIB) -static diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 4af010002..871a37796 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,13 +1,2 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_builddir)/test/common - -AM_CFLAGS += -I$(top_srcdir)/test/common -AM_LDFLAGS += $(DPDK_PMDS) - -AM_CFLAGS += $(CUNIT_CFLAGS) - -LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la -LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la -LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la From patchwork Mon Jan 15 00:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124452 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp503506lje; Sun, 14 Jan 2018 16:07:19 -0800 (PST) X-Google-Smtp-Source: ACJfBosV/E1jMdkbaAaWOFwuTOO/8jb7Yr3t+HxU9AkoKz0IIHtMfFVfPTYTLA/rHvaxEjW1Gh7l X-Received: by 10.55.146.70 with SMTP id u67mr48725188qkd.322.1515974838872; Sun, 14 Jan 2018 16:07:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974838; cv=none; d=google.com; s=arc-20160816; b=TlsckbnlrIJUTp6zwWCPpZVarqxxwcW2zXO2ET70IBevFCi9hZt2Mx1NKpZMIb4CPK nre/UIyRTmHLjQohrGukz7zf0RUNhcSWdf2w0kd1LErVaQGEHw16wjlYq5/PWWd6Pv70 d19GcFzpZsZTaDH407Z0dmrgDLfnMsiabYqibcARHls8jkb3Fa8S0sdrgyjHVLa0kF3k 0eMF/Y79XnUvw8dtbnwzoTrTYZY4qghDIqpdosSnahpsgIIUHlM818VcJdLcDVbnXHDt YKiTEiMKJgPBVTFZUz8VtWWmYV0Mx+z1FJcxqmZKyzSnUFIO6/Sa372UGb6r+8SmBHSq dMoQ== 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=4Hgj795GAoxikGli0I4+ClS2lGdTMLKBBpLPzCnBQjQ=; b=mgb3y9ztFC7E/5iy/gzKYvYlifXQftodTSyxYGrYCxgSoDb5a6lFgfV7nNBGq82gwy XhFfeNc3uNRV2VQ6yUt/lXOAZSYOGDGoXK6fCeqHQdFyAIxV5ux0dj/yMbBc8TXFPgwS lWafvqBxI+gHr6dV0TDm5A/lrZsG2U/eCG7iTDuIXLJLdwIeD8t46LNwyxssqT7l0k1L 4V6lgyWEoYlLTzadz0pz3BPanJwQmXhDaNs7A9BKxvZ7nmwzbGJbDmyh/TfIjCp2dMkb uQ56+gW891OsrWbOBU2Hx2KN8lMaSYioVUaX0wZzCG9QRhOz55+s29BtY4Aiz5GLiSp3 A7hA== 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 s69si4323878qke.470.2018.01.14.16.07.18; Sun, 14 Jan 2018 16:07:18 -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 8A88F61762; Mon, 15 Jan 2018 00:07:18 +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_H2 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 408F161757; Mon, 15 Jan 2018 00:04:17 +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 1982D616D9; Mon, 15 Jan 2018 00:04:07 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 4FEAB616D9 for ; Mon, 15 Jan 2018 00:02:29 +0000 (UTC) Received: from mxback4j.mail.yandex.net (mxback4j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10d]) by forward103p.mail.yandex.net (Yandex) with ESMTP id E7F512183155 for ; Mon, 15 Jan 2018 03:02:27 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback4j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id G9FnUcSBFj-2RXCNjbR; Mon, 15 Jan 2018 03:02:27 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-24euwGkj; Mon, 15 Jan 2018 03:02:04 +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, 15 Jan 2018 03:00:07 +0300 Message-Id: <1515974412-25863-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 9/14] validation: stop overriding LDADD variable 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: Dmitry Eremin-Solenikov LDADD variable can be used to pass other libraries (like DPDK). Stop overriding LDADD entirely. Instead use PRELDADD variable or appending to LDADD. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ platform/linux-generic/test/ring/Makefile.am | 2 +- platform/linux-generic/test/validation/api/shmem/Makefile.am | 3 +-- test/Makefile.inc | 5 +++-- test/validation/api/Makefile.inc | 1 + test/validation/api/atomic/Makefile.am | 1 - test/validation/api/barrier/Makefile.am | 1 - test/validation/api/buffer/Makefile.am | 1 - test/validation/api/chksum/Makefile.am | 1 - test/validation/api/classification/Makefile.am | 1 - test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 1 - test/validation/api/errno/Makefile.am | 1 - test/validation/api/event/Makefile.am | 1 - test/validation/api/hash/Makefile.am | 1 - test/validation/api/init/Makefile.am | 3 --- test/validation/api/ipsec/Makefile.am | 5 +---- test/validation/api/lock/Makefile.am | 1 - test/validation/api/packet/Makefile.am | 1 - test/validation/api/pktio/Makefile.am | 1 - test/validation/api/pool/Makefile.am | 1 - test/validation/api/queue/Makefile.am | 1 - test/validation/api/random/Makefile.am | 1 - test/validation/api/scheduler/Makefile.am | 1 - test/validation/api/shmem/Makefile.am | 1 - test/validation/api/std_clib/Makefile.am | 1 - test/validation/api/system/Makefile.am | 1 - test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 1 - test/validation/api/timer/Makefile.am | 1 - test/validation/api/traffic_mngr/Makefile.am | 2 +- 30 files changed, 10 insertions(+), 36 deletions(-) diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 95e5e87f4..8287c7e04 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -6,4 +6,4 @@ ring_main_SOURCES = \ ring_suites.c ring_suites.h \ ring_basic.c ring_stress.c -ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) +PRELDADD += $(LIBCUNIT_COMMON) diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index f75cbc976..07d311d2f 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -7,10 +7,9 @@ test_PROGRAMS = shmem_linux shmem_odp1 shmem_odp2 shmem_linux_SOURCES = shmem_linux.c shmem_linux.h shmem_common.h shmem_linux_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt +shmem_linux_LDADD = #shmem_odp1 and shmem_odp2 are the 2 ODP processes: shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h -shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h -shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/Makefile.inc b/test/Makefile.inc index d4d74c25e..0b5b66dd0 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -10,8 +10,9 @@ LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things -#before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) +#before libodp by setting PRELDADD before the inclusion. +LDADD = $(PRELDADD) $(LIBODP) $(DPDK_PMDS) +PRELDADD = INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 871a37796..8610b5687 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,2 +1,3 @@ include $(top_srcdir)/test/Makefile.inc +PRELDADD += $(LIBCUNIT_COMMON) diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am index 859e3c51a..4de45970f 100644 --- a/test/validation/api/atomic/Makefile.am +++ b/test/validation/api/atomic/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = atomic_main atomic_main_SOURCES = atomic_main.c atomic.c atomic.h -atomic_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am index b0310e3a5..aad5ddd60 100644 --- a/test/validation/api/barrier/Makefile.am +++ b/test/validation/api/barrier/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = barrier_main barrier_main_SOURCES = barrier_main.c barrier.c barrier.h -barrier_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am index 59639ff7b..901fdadc7 100644 --- a/test/validation/api/buffer/Makefile.am +++ b/test/validation/api/buffer/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = buffer_main buffer_main_SOURCES = buffer_main.c buffer.c buffer.h -buffer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/chksum/Makefile.am b/test/validation/api/chksum/Makefile.am index 3227294d4..9bd443857 100644 --- a/test/validation/api/chksum/Makefile.am +++ b/test/validation/api/chksum/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = chksum_main chksum_main_SOURCES = chksum_main.c chksum.c chksum.h -chksum_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am index b58703079..303a35767 100644 --- a/test/validation/api/classification/Makefile.am +++ b/test/validation/api/classification/Makefile.am @@ -9,4 +9,3 @@ classification_main_SOURCES = classification_main.c \ odp_classification_common.c \ classification.c \ classification.h -classification_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am index ff12f56f7..e5c78d924 100644 --- a/test/validation/api/cpumask/Makefile.am +++ b/test/validation/api/cpumask/Makefile.am @@ -2,4 +2,4 @@ include ../Makefile.inc test_PROGRAMS = cpumask_main cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h -cpumask_main_LDADD = $(LIBCPUMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += $(LIBCPUMASK_COMMON) diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am index 94f1c1cae..238ce1892 100644 --- a/test/validation/api/crypto/Makefile.am +++ b/test/validation/api/crypto/Makefile.am @@ -8,4 +8,3 @@ crypto_main_SOURCES = crypto_main.c \ odp_crypto_test_inp.h \ test_vectors.h \ test_vectors_len.h -crypto_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am index 9eddfb482..ad5c7ded4 100644 --- a/test/validation/api/errno/Makefile.am +++ b/test/validation/api/errno/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = errno_main errno_main_SOURCES = errno_main.c errno.c errno.h -errno_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/event/Makefile.am b/test/validation/api/event/Makefile.am index be4764b58..762f93568 100644 --- a/test/validation/api/event/Makefile.am +++ b/test/validation/api/event/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = event_main event_main_SOURCES = event_main.c event.c event.h -event_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am index bd098ffb6..8f0057782 100644 --- a/test/validation/api/hash/Makefile.am +++ b/test/validation/api/hash/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = hash_main hash_main_SOURCES = hash_main.c hash.c hash.h -hash_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 522c3a187..2d0661431 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -7,6 +7,3 @@ test_PROGRAMS = init_main_abort init_main_log init_main_ok init_main_abort_SOURCES = init_main_abort.c init.c init.h init_main_log_SOURCES = init_main_log.c init.c init.h init_main_ok_SOURCES = init_main_ok.c init.c init.h -init_main_abort_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -init_main_log_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -init_main_ok_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am index b300c8e88..328826995 100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am @@ -21,7 +21,4 @@ ipsec_async_SOURCES = ipsec_async.c ipsec_inline_in_SOURCES = ipsec_inline_in.c ipsec_inline_out_SOURCES = ipsec_inline_out.c -ipsec_sync_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_async_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_inline_in_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_inline_out_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += libtestipsec.la diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am index b434fe77c..c5518b3a8 100644 --- a/test/validation/api/lock/Makefile.am +++ b/test/validation/api/lock/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = lock_main lock_main_SOURCES = lock_main.c lock.c lock.h -lock_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am index 43300ed0d..d33cdadbd 100644 --- a/test/validation/api/packet/Makefile.am +++ b/test/validation/api/packet/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = packet_main packet_main_SOURCES = packet_main.c packet.c packet.h -packet_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am index a416fd1da..a6a16e2f0 100644 --- a/test/validation/api/pktio/Makefile.am +++ b/test/validation/api/pktio/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = pktio_main pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h -pktio_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am index 9e7c42b51..7951d0484 100644 --- a/test/validation/api/pool/Makefile.am +++ b/test/validation/api/pool/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = pool_main pool_main_SOURCES = pool_main.c pool.c pool.h -pool_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am index 9b1c6b777..5ed4638bc 100644 --- a/test/validation/api/queue/Makefile.am +++ b/test/validation/api/queue/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = queue_main queue_main_SOURCES = queue_main.c queue.c queue.h -queue_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am index e9e7ffc06..8f1ba9fe0 100644 --- a/test/validation/api/random/Makefile.am +++ b/test/validation/api/random/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = random_main random_main_SOURCES = random_main.c random.c random.h -random_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am index 34abf7d6a..3673ad7ce 100644 --- a/test/validation/api/scheduler/Makefile.am +++ b/test/validation/api/scheduler/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = scheduler_main scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h -scheduler_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am index 8c5d7f700..9a10668f5 100644 --- a/test/validation/api/shmem/Makefile.am +++ b/test/validation/api/shmem/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = shmem_main shmem_main_SOURCES = shmem_main.c shmem.c shmem.h -shmem_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am index dc75c95cf..34b888bbb 100644 --- a/test/validation/api/std_clib/Makefile.am +++ b/test/validation/api/std_clib/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = std_clib_main std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h -std_clib_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am index 123d3a693..e6fbb0ea5 100644 --- a/test/validation/api/system/Makefile.am +++ b/test/validation/api/system/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = system_main system_main_SOURCES = system_main.c system.c system.h -system_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am index 1c56574f4..2282169b9 100644 --- a/test/validation/api/thread/Makefile.am +++ b/test/validation/api/thread/Makefile.am @@ -3,4 +3,4 @@ include ../Makefile.inc test_PROGRAMS = thread_main thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK thread_main_SOURCES = thread_main.c thread.c thread.h -thread_main_LDADD = $(LIBTHRMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += $(LIBTHRMASK_COMMON) diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index 669d1226b..4c3340e06 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -9,7 +9,6 @@ TESTS = $(TESTSCRIPTS) test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h -time_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am index c953dcb34..576174400 100644 --- a/test/validation/api/timer/Makefile.am +++ b/test/validation/api/timer/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = timer_main timer_main_SOURCES = timer_main.c timer.c timer.h -timer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index dc4f87092..82996afe0 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -9,7 +9,7 @@ TESTS = $(TESTSCRIPTS) test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h -traffic_mngr_main_LDADD = -lm $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += -lm dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) From patchwork Mon Jan 15 00:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124453 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp504029lje; Sun, 14 Jan 2018 16:09:26 -0800 (PST) X-Google-Smtp-Source: ACJfBot7vc00wCwxjeGSnLFKmf11mUArInT2zM7Pm8kJkhvC4MJ0Y2jjc0AHYS/4zsNrrvZaX9DI X-Received: by 10.200.58.36 with SMTP id w33mr3622100qte.76.1515974966532; Sun, 14 Jan 2018 16:09:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974966; cv=none; d=google.com; s=arc-20160816; b=eTkkQoDqowQDLKZTbkmSPUw9bWFKBKxFBZwnWltTuSuY7Y8IY0DQ/vzkVy9xuc5TiQ UaDTO/G9TrKFdKLuvq7oBKlnZcTwJnzK0vEBMArx4+tTnFuoLTVoZYNfzkJ5ioBmchLx z77Ws9fXYajsB8i1sh8Hjr5wTVYVYlBE/5Twdo9GEDWXY6vq8rEXDdrkV22s4296lfDO 8K93/45pelgy/yEr5en7Ww7kjMDRuczS9wshK30VDzf3CJj4/VehPAMKHBZiwBympQPX zQojlQPDKxalvE4uyacfMor+t6Gwbao43HlFUtTKP6zUBHLCHWf+z0cueZfQIiKJNHaZ Itig== 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=KDHmTKcGPZhhJOCt40CONe+uQlB9Bf0WKz3C/L78lIg=; b=yP6hhGNRZM4mtMr0OkIoVwG5+Gd4UuuzEjKWQ/sgCiY1mQHIOi8WfMdKJOJXq2Auk+ P03aGUFipKfWZnjBLxPGolay217rt2PY8EnFKe9dmNTZI31nLRu/UFJaD/IZP/t0TSRa WIR+dQ2XhiD7nzp61MP+0pD+F6ujAjWfjfwh0fG6HpBODoTMfKoPTzpk2v+E3fK8SVdS n3HEfs6SKu2uyeDb4dgY9ndj9ODTuD2+lKsKCrXPdl8EecjvVzxo2R63Ho5Tb1XWGgot /n9d1lHx5hwaF8imA9+lJfzUkyXehq0syqrwIYqJKlZ8BMQZZ3ngMFyjfa04Iw56lAtx NE9g== 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 e4si1970692qth.119.2018.01.14.16.09.26; Sun, 14 Jan 2018 16:09:26 -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 20FDE61749; Mon, 15 Jan 2018 00:09:26 +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_H2 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 CB6A161777; Mon, 15 Jan 2018 00:04:24 +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 CEEA76177E; Mon, 15 Jan 2018 00:04:19 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 2610E6174E for ; Mon, 15 Jan 2018 00:02:36 +0000 (UTC) Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward102p.mail.yandex.net (Yandex) with ESMTP id A19C3430312A for ; Mon, 15 Jan 2018 03:02:34 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback2o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Lm9bkMfO84-2Y6Sp7uF; Mon, 15 Jan 2018 03:02:34 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-2ReWjgl2; Mon, 15 Jan 2018 03:02:27 +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, 15 Jan 2018 03:00:08 +0300 Message-Id: <1515974412-25863-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 10/14] validation: time: use clock_gettime() instead of clock() 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: Dmitry Eremin-Solenikov ODP test for time API uses clock() to compare time against. However clock() returns processor time used by program, which can differ between runs. Use clock_gettime() as a time source to compare against. Signed-off-by: Dmitry Eremin-Solenikov Fixes: https://bugs.linaro.org/show_bug.cgi?id=3572 --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ test/validation/api/time/time.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index c8f90dbac..d7d5b790e 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -423,11 +423,12 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) { int i; odp_time_t t1, t2, wait, diff; - clock_t c1, c2; + struct timespec ts1, ts2, tsdiff; double sec_t, sec_c; odp_time_t sec = time_from_ns(ODP_TIME_SEC_IN_NS); - c1 = clock(); + i = clock_gettime(CLOCK_MONOTONIC, &ts1); + CU_ASSERT(i == 0); t1 = time_cur(); wait = odp_time_sum(t1, sec); @@ -436,12 +437,21 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) wait = odp_time_sum(wait, sec); } + i = clock_gettime(CLOCK_MONOTONIC, &ts2); + CU_ASSERT(i == 0); t2 = time_cur(); - c2 = clock(); + + if (ts2.tv_nsec < ts1.tv_nsec) { + tsdiff.tv_nsec = 1000000000L + ts2.tv_nsec - ts1.tv_nsec; + tsdiff.tv_sec = ts2.tv_sec - 1 - ts1.tv_sec; + } else { + tsdiff.tv_nsec = ts2.tv_nsec - ts1.tv_nsec; + tsdiff.tv_sec = ts2.tv_sec - ts1.tv_sec; + } diff = odp_time_diff(t2, t1); sec_t = ((double)odp_time_to_ns(diff)) / ODP_TIME_SEC_IN_NS; - sec_c = ((double)(c2 - c1)) / CLOCKS_PER_SEC; + sec_c = ((double)(tsdiff.tv_nsec) / 1000000000L) + tsdiff.tv_sec; /* Check that ODP time is within +-5% of system time */ CU_ASSERT(sec_t < sec_c * 1.05); From patchwork Mon Jan 15 00:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124454 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp504256lje; Sun, 14 Jan 2018 16:10:11 -0800 (PST) X-Google-Smtp-Source: ACJfBou+SBf5f4dy7AsPZtDARW9rMCVVcWDe1mP7AgtOt/EVsIQN4bqqGQjmZnBnWFOhB7BL0Jz/ X-Received: by 10.237.44.98 with SMTP id f89mr3914477qtd.94.1515975011693; Sun, 14 Jan 2018 16:10:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515975011; cv=none; d=google.com; s=arc-20160816; b=NxPYQnQedLEcyuMucvg+buY8FYNT5jfzhPvUqp7rr40kYMmGY5muUY8+CE7RRTDz1Y vgN34U2q+nFzopmnPj07vpwJqB1HDUgLUIliPxF5Mg9A1Fc+yq+YmVqJ3F6geBcY2L1E wk28rqBI+YDETuyVPTJa5GV74C5NoGEDunhHFznHU4wQ80E91fNiI2Wtxui9rQdOUNYB /omMIixnb+BZSTTNZbBEKETruiPjyh2lx9Hqaj0rQs9ewyExJwnX7fuDZfsv2mZEnsRy mClMxw15ISmyqswuJgUwa0L7LdQT0VeDQ9HtGyQ5HnFQj763d6q7sQLtyAKCvmBtDQ0L JV/g== 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=qVsXjAcWxLUGD2Pxtxm08ZPh0mIPYBCLwf9E+bmu1c8=; b=L+Wh3zJtQPGzA0zvOe/ZmkTKq517ifaguj5XFkHOH5YSkeXcwB/x+NiPK6P8OPCjHg aj3raMig/QEqQFXO3dhhTuCNS51NF/cmi/vt1Cyml7dA1uu3xhfxxLVJG4Qg9PwLBbLq ilPkOFhiVoJwhGT1Z8Ro22RKWWvrDar+LyztUHEXH3bazFmAezf3OyOSGIphCXCrt/k7 ygIGb5QdY89O1bx3WuzOP3+pXAWn37qAehDx2IH73ok4PK5kOL2uiqpQ66JCKNRy0CUn HCDKesngv6BxdSfcYMbNGsS/1r/+yR1wnO+G9loQfyKbEuhW4y5PRF48ZAMLAk8gxQxC nGSA== 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 h129si4543547qkf.410.2018.01.14.16.10.11; Sun, 14 Jan 2018 16:10:11 -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 61EBC60BF4; Mon, 15 Jan 2018 00:10:11 +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_H2 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 3B2916175F; Mon, 15 Jan 2018 00:04:31 +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 6408C61754; Mon, 15 Jan 2018 00:04:25 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 4019161754 for ; Mon, 15 Jan 2018 00:02:42 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 1019B183026 for ; Mon, 15 Jan 2018 03:02:41 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id SR6fJO8Gvo-2fJ0Y8cB; Mon, 15 Jan 2018 03:02:41 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-2YeWpw0u; Mon, 15 Jan 2018 03:02:34 +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, 15 Jan 2018 03:00:09 +0300 Message-Id: <1515974412-25863-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 11/14] Revert "test: time: do not fail under gcov" 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: Dmitry Eremin-Solenikov This reverts commit 7a7e3ff9d50d67b7c79058db98ba27ab5a806437. After fixing time test to use clock_gettime() instead of clock(), this test should not fail under Travis/coverage. Reenable the test. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ test/validation/api/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 10 --------- test/validation/api/time/time.sh | 42 ------------------------------------ 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100755 test/validation/api/time/time.sh diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index 0503e092e..c92d123c1 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -56,7 +56,7 @@ TESTS = \ scheduler/scheduler_main$(EXEEXT) \ std_clib/std_clib_main$(EXEEXT) \ thread/thread_main$(EXEEXT) \ - time/time.sh \ + time/time_main$(EXEEXT) \ timer/timer_main$(EXEEXT) \ traffic_mngr/traffic_mngr.sh \ shmem/shmem_main$(EXEEXT) \ diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index 4c3340e06..bedbfa375 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -1,14 +1,4 @@ include ../Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${builddir} - -TESTSCRIPTS = time.sh -TEST_EXTENSIONS = .sh - -TESTS = $(TESTSCRIPTS) - test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h - -dist_check_SCRIPTS = $(TESTSCRIPTS) -test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/validation/api/time/time.sh b/test/validation/api/time/time.sh deleted file mode 100755 index ecedddb76..000000000 --- a/test/validation/api/time/time.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2017, Linaro Limited -# All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -# directories where time_main binary can be found: -# -in the validation dir when running make check (intree or out of tree) -# -in the script directory, when running after 'make install', or -# -in the validation when running standalone (./time) intree. -# -in the current directory. -# running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/time:$PATH -PATH=$(dirname $0)/../../../../validation/api/time:$PATH -PATH=$(dirname $0):$PATH -PATH=`pwd`:$PATH - -time_main_path=$(which time_main${EXEEXT}) -if [ -x "$time_main_path" ] ; then - echo "running with time_main: $time_run_path" -else - echo "cannot find time_main: please set you PATH for it." - exit 1 -fi - -# exit codes expected by automake for skipped tests -TEST_SKIPPED=77 - -time_main${EXEEXT} -ret=$? - -SIGSEGV=139 - -if [ "${TRAVIS}" = "true" ] && [ $ret -ne 0 ] && - [ ${TEST} = "coverage" ] && [ $ret -ne ${SIGSEGV} ]; then - echo "SKIP: skip due significant slowdown under code coverage" - exit ${TEST_SKIPPED} -fi - -exit $ret From patchwork Mon Jan 15 00:00:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124455 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp504439lje; Sun, 14 Jan 2018 16:11:01 -0800 (PST) X-Google-Smtp-Source: ACJfBoumypATTpYiv8MAuhsaiV1U2rpqF/Hg/nKvymXabJb85pRipdoMLyaBot0QcUNQ/8Ewc+T1 X-Received: by 10.55.50.83 with SMTP id y80mr44704813qky.347.1515975061588; Sun, 14 Jan 2018 16:11:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515975061; cv=none; d=google.com; s=arc-20160816; b=HzbAby0G3EqnQjVZIgdkWdle+p+q4kzChMAaOZVagz3+LcKJtQOac3p6onf6C15hH+ nxMzGvQIVP+1aguV6MYE1b4jS0oI9J184ACVqlLXqK/0UV7ZYZwYhfcrvq1QuEb1n+Oj zP20de5MfwbNyFwavBzuuegEzgciWBZwIiOCsZ287zvTT899l2XU+Hk6ZdFvQVUWM8Ta M99c/5B6+mWLunYF135HeL8gY86mTbIsKhNcBZZwNFQorX28SylJ2Fp1C0hbJP9cpA4t H0N3TLzgwN6MuuSSZR07pNSDqyAPqshfhCmkjVdBbiCKkGG3nAoaai6VVTbWjvTie05m ReZQ== 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=uk0G6c4dlXL2sZK8vNojmMMF4QqhNYdz+AT04dTsFKI=; b=bk0U8WrmHN4aAZ6jO7naKflnCxchESgN3ojDgyBIkSa2CJOe47hTXow+Mhlrz73iwE F+j0gsK53e+ovB6YLwIAt+Ar9t4qjvZdQJ9SNW1LfnerwsmTkgAgwq9+DhsCeTig7C/Z HGCUrk2Bw/k/UWl+/JaerJsZdFRLytsQONVo0AoA1j97POUFQ+IvVS91ElW6nm+Qglrt dUodaClvvNcGftsc48yt42Q5nkOvV5p6iDRjFraWLCRdfU5Z6NxwJI/Ob6nkwsdTcfee y5W5I/EwTUgY0ds4GStWELWqYtUd47kfJjrPGnhMW+pU7jKuMacpQ2/Mu0X6P3mz8dYw N5Rg== 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 a79si2946259qkg.299.2018.01.14.16.11.01; Sun, 14 Jan 2018 16:11:01 -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 2A5536174C; Mon, 15 Jan 2018 00:11:01 +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_H2 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 B4E6260912; Mon, 15 Jan 2018 00:04:53 +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 0D6B76175D; Mon, 15 Jan 2018 00:04:46 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 6503B61731 for ; Mon, 15 Jan 2018 00:03:06 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 69BA921811D3 for ; Mon, 15 Jan 2018 03:03:05 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback8g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id zN9rh6rGtp-35taMFrh; Mon, 15 Jan 2018 03:03:05 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-2fe8v5Oc; Mon, 15 Jan 2018 03:02:41 +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, 15 Jan 2018 03:00:10 +0300 Message-Id: <1515974412-25863-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 12/14] linux-gen: don't use SYSCONFDIR 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: Dmitry Eremin-Solenikov sysconfig is not used in TigerMoth, so let's drop the variable in linux-gen's Makefile. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ platform/linux-generic/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7e40448bd..415e7b8b7 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default -AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) From patchwork Mon Jan 15 00:00:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124456 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp504527lje; Sun, 14 Jan 2018 16:11:38 -0800 (PST) X-Google-Smtp-Source: ACJfBou3fWpT/xQsK6f8eHeOsg0DiNsxkGPa2Qs/r6T/3glcPe1/g1VMlOq4T1oYoJdU6gNzdkx/ X-Received: by 10.55.100.141 with SMTP id y135mr3295765qkb.3.1515975097863; Sun, 14 Jan 2018 16:11:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515975097; cv=none; d=google.com; s=arc-20160816; b=lj3p9zy1FGaKOnYwrZw2TOpwBfNXEmK1wb2T2yrcTbTSFja1K639y4impEXFqBHyld DINo8rzYevGfzCC5qu5OjrMSe/k9NTc93lE8EpnbeyUKjFEjwfmk8ncg4u3+udT4etSS 22fta6/MQ3IGCjS22DSc+2J4S7/VGfNf/UPrCluFmUIUeEGNKJW2SY1GWXYR7pt1mPwD 7HIHcOYjV10yYZWvKUmoV2vx4STGPNyjh+8YKmGF84oVubO6tmYXhobd7JjlyFkTD3vR vyQaf6KiwFazEFoXxaouBixQbET6uRF+VSeoaZ2uW1+W/Dy9VS73W6BE0BdeUsDd/fir 5/0A== 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=su/STCZ8nIrhf3Zs0WqKVZxo7mx6PXs7t2Ztcg2Unq0=; b=btzUrO3H0kyNMigmGJYsGq+k0bEDsd1oEFDD9wA7QcYMZ1q/w3e7jPqGswwMyN5CGL KsVHhwAOHSH19BE8ULjkI5e+Om8+aHUxrd6RJgvj5E9J4xS6Aq3JJ8LTZ5xIijybN9lR L/oSCYMkp1Kpcw9eBMIRiPSSAH2HUp+S77T8l8hqR1HUmw//r8xoxtKsonFX3HZp5aYM tsq9z+nGJDolba7LDLkiQbiotkxxV5fHjjpplNEv6BuAoZn4yCDAcb98/LvT4tMND4Ba hRuIH/naNMUCYcAWecUKhiaT5sivbI/hlGIdI+nnhVGwGW1k64uOCKSRFwyEhLDOHC2h z6Cw== 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 l56si1987820qta.36.2018.01.14.16.11.37; Sun, 14 Jan 2018 16:11:37 -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 85CC06173A; Mon, 15 Jan 2018 00:11:37 +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_H2 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 3954B616F7; Mon, 15 Jan 2018 00:05:00 +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 5F2BB616F7; Mon, 15 Jan 2018 00:04:56 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 4BAD461764 for ; Mon, 15 Jan 2018 00:03:13 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward105o.mail.yandex.net (Yandex) with ESMTP id D090D4442D3D for ; Mon, 15 Jan 2018 03:03:11 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id cVwhrTIT5v-3BB04FFW; Mon, 15 Jan 2018 03:03:11 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-35eK3gvu; Mon, 15 Jan 2018 03:03:05 +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, 15 Jan 2018 03:00:11 +0300 Message-Id: <1515974412-25863-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 13/14] tests: don't use ODP_SYSCONFIG_FILE 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: Dmitry Eremin-Solenikov libconfig is not used in TigerMoth, so let's drop the variable in test's Makefile.inc. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ test/Makefile.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/Makefile.inc b/test/Makefile.inc index 0b5b66dd0..192dab221 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -33,5 +33,4 @@ AM_LDFLAGS = -L$(LIB) -static @VALGRIND_CHECK_RULES@ TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} \ - EXEEXT=${EXEEXT} \ - ODP_SYSCONFIG_FILE=none + EXEEXT=${EXEEXT} From patchwork Mon Jan 15 00:00:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124457 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp504677lje; Sun, 14 Jan 2018 16:12:26 -0800 (PST) X-Google-Smtp-Source: ACJfBouxKe1HbUZtb32Jx85ENd769RVhquVuJ1Tt+7HuhEv2yG/C1+ZD7At3RliotzcjpA35Sgh3 X-Received: by 10.200.27.52 with SMTP id y49mr29341949qtj.161.1515975146199; Sun, 14 Jan 2018 16:12:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515975146; cv=none; d=google.com; s=arc-20160816; b=dJhPWHYY5+xovekY3VPrVEmtDQ25cuRsVJwwqddGnukSLvosiGsHod5GBQE3B16cz1 aLo+G1fd9h5PlzOVsRWsehFnhDZSg5lkl+qRsvmtGote7CthEQoXwMbg0Ah4D1Ej14T3 LcBE/kGowI/UceN3gFgGsexQFlxDCkFNSUTIb9rGgdKgBsz0TbxAmtzY/3ccfBpvr9a5 OFapxWAYyoCM2TjVKKJ37yWCX61Vc0OYBrTCK7J7SIp50rnQOIBS9GN3Y3QZWDi87rUT bmtAGYZ+3/mHbiwD6ZBI99KVim2Rf+SEo3Q8TcdrlhZXazMkPPAwZiFyWB5m/UNVCFg7 SClg== 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=OCYCBLD50LM8PzExw5tbB0gu3LuSFtjCSGw3N5DXE3s=; b=UrRKXWY+rmAntM4MpXKTGwpXJMoWRSh1Uf3Lz7bZV1a/tI20/KHMRXUdNNfJF6GZLE Jqon4/dKZa6pbUkrUbdTAEoR+aJCB8oZL7iDfh7aMw/8GNO289905gRGL7V9y/XBm0m9 YSKDdqWoWr/9G2A0Y6xw43urP2xVMEG4NdpK9wg79aVp5znVeaFq2f11EiDErpCo6OdN lUD7N25SHC4dNqZ6S5yIgPBobIajJW7WuAfxqK06Ayg6NFIn5xiBuIgl/r4pYubLc9nn am9vcyxSicFSV9RfA+xlBlJHpq7qwnMvoVLiZ4k++YbnWrLIscSlRpURB+/32VIIR29p n1NQ== 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 w4si3166612qkd.390.2018.01.14.16.12.25; Sun, 14 Jan 2018 16:12:26 -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 DD10B6170E; Mon, 15 Jan 2018 00:12:25 +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 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 D4B346174F; Mon, 15 Jan 2018 00:05:17 +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 7571F61754; Mon, 15 Jan 2018 00:05:06 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id BCF8761714 for ; Mon, 15 Jan 2018 00:03:36 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 851525602F37 for ; Mon, 15 Jan 2018 03:03:35 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id rxOg3x3E1p-3ZMGr8Wt; Mon, 15 Jan 2018 03:03:35 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-3BeKAiJw; Mon, 15 Jan 2018 03:03: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, 15 Jan 2018 03:00:12 +0300 Message-Id: <1515974412-25863-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 14/14] example: ipsec_api: remove file conflict with ipsec example 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: Dmitry Eremin-Solenikov ipsec_api example installs program with the same name, as ipsec example does. Remove file conflict between two examples. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ example/ipsec_api/Makefile.am | 27 +++++++++++----------- ...sec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} | 2 +- ...c_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} | 2 +- ...ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} | 2 +- ..._tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} | 2 +- ...c_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} | 2 +- ...run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} | 2 +- ...p_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} | 2 +- ...tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} | 2 +- ...ipsec_run_live.sh => odp_ipsec_api_run_live.sh} | 2 +- ...c_run_router.sh => odp_ipsec_api_run_router.sh} | 2 +- ...c_run_simple.sh => odp_ipsec_api_run_simple.sh} | 2 +- 12 files changed, 25 insertions(+), 24 deletions(-) rename example/ipsec_api/{odp_ipsec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_live.sh => odp_ipsec_api_run_live.sh} (94%) rename example/ipsec_api/{odp_ipsec_run_router.sh => odp_ipsec_api_run_router.sh} (85%) rename example/ipsec_api/{odp_ipsec_run_simple.sh => odp_ipsec_api_run_simple.sh} (87%) diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 14bc5dd66..848683e00 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -3,22 +3,23 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) LDADD += $(OPENSSL_LIBS) -bin_PROGRAMS = odp_ipsec +bin_PROGRAMS = odp_ipsec_api dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_run_ah_in.sh \ - $(srcdir)/odp_ipsec_run_ah_out.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_in.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_out.sh \ - $(srcdir)/odp_ipsec_run_esp_in.sh \ - $(srcdir)/odp_ipsec_run_esp_out.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_in.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_out.sh \ - $(srcdir)/odp_ipsec_run_live.sh \ - $(srcdir)/odp_ipsec_run_router.sh \ - $(srcdir)/odp_ipsec_run_simple.sh + $(srcdir)/odp_ipsec_api_run_ah_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_out.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_live.sh \ + $(srcdir)/odp_ipsec_api_run_router.sh \ + $(srcdir)/odp_ipsec_api_run_simple.sh -odp_ipsec_SOURCES = odp_ipsec.c \ +odp_ipsec_api_SOURCES = \ + odp_ipsec.c \ odp_ipsec_sa_db.c \ odp_ipsec_sa_db.h \ odp_ipsec_sp_db.c \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_in.sh index c5b105f59..becfc8928 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_out.sh index c8926d5ac..023809a18 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh index a0d4c4332..40c488f04 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh index 74a0e3b42..d7118586f 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_run_esp_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_esp_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_in.sh index 39e171cdf..cdb302ef4 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_out.sh index 98ab04e52..f1c15ffee 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh index 7ef3e2d08..5d78479e4 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh index 98ab04e52..f1c15ffee 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_live.sh b/example/ipsec_api/odp_ipsec_api_run_live.sh similarity index 94% rename from example/ipsec_api/odp_ipsec_run_live.sh rename to example/ipsec_api/odp_ipsec_api_run_live.sh index b506b2af8..9bc0a60f3 100755 --- a/example/ipsec_api/odp_ipsec_run_live.sh +++ b/example/ipsec_api/odp_ipsec_api_run_live.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:both \ diff --git a/example/ipsec_api/odp_ipsec_run_router.sh b/example/ipsec_api/odp_ipsec_api_run_router.sh similarity index 85% rename from example/ipsec_api/odp_ipsec_run_router.sh rename to example/ipsec_api/odp_ipsec_api_run_router.sh index 31b9e7656..982a27e97 100755 --- a/example/ipsec_api/odp_ipsec_run_router.sh +++ b/example/ipsec_api/odp_ipsec_api_run_router.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -c 1 "$@" diff --git a/example/ipsec_api/odp_ipsec_run_simple.sh b/example/ipsec_api/odp_ipsec_api_run_simple.sh similarity index 87% rename from example/ipsec_api/odp_ipsec_run_simple.sh rename to example/ipsec_api/odp_ipsec_api_run_simple.sh index ddda612a8..bdc2777c9 100755 --- a/example/ipsec_api/odp_ipsec_run_simple.sh +++ b/example/ipsec_api/odp_ipsec_api_run_simple.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ -c 2 "$@"