From patchwork Thu Feb 22 09: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: 129168 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp375716lja; Thu, 22 Feb 2018 01:07:09 -0800 (PST) X-Google-Smtp-Source: AH8x227rLjCgOdK8vRScyKA4E0YA57UDFQ6hqSoxUOkOKgdvYHaXuvuVFrV4ksp1GugBdWzcHeSu X-Received: by 10.55.17.196 with SMTP id 65mr9225896qkr.86.1519290429028; Thu, 22 Feb 2018 01:07:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519290429; cv=none; d=google.com; s=arc-20160816; b=DK1xc0MFfyyPPx/lpfzujcNb6F0+BplB4HTcBTo3oAkaaz2DmREvTuBbZXq1unodOh LbJdJHkImIu1YtlRcRXHM7V4oA/2IUFLSKnjZ8Us0qOd9Q33YV0NHPqM/gHGLFa2sCIZ Cb8TdxbrJY9TbHOhM/GjUJbR3nuaA69yp152RiHOLxlWUW05jWNKYkmewud6uqQx9ET6 DdvzAM3WIVDc85U4hPrc2RTExm6z35AVHozrAOosfd1Cf9wvJvnEImlOPsOwJP2KAndW KwG9F+oed6eUnazx37HQtX7kd6XjXGkl1/GW8zyRCqbvKNi+7jFFFeHZaJXlneiODiPi ctMA== 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=Sx7EhqH9ODz1VooKp4WKpOBtCHv5XtqthbwapjO8Dtk=; b=cPJz4q9C12EAzz2KsGVgTpkh6VVLYvHkV/4Fgo0BXwEjK/g2TKwOMDTF5AhZth+4qj hFcIHLD/JUnzGjtlbS4dp3xY4NmsP/A+94QhQzHkgH093JgXTKJqq85zQ7zfiovN0+LE 73t6Te/Eck/mIHkh3gFkkWKszxS+utlTQnHLJUEN0MfjPtnYYJgsbuOccJqAbPNOn3FA 1TBtsupe5QUJ4r82vSke0lV1UmlgwcOXVkCdP7Ewx7HCuMyC2UyQVMcTAm91YVrcfwXV KqgXE4Iwd2nzkH4uvXrxeYQvUa2zuCmyFHf51C2b5NJt6yR8FGmmiES5f8eoRmGxN7KO je8w== 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 z9si869562qtb.137.2018.02.22.01.07.08; Thu, 22 Feb 2018 01:07:09 -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 9F6756175B; Thu, 22 Feb 2018 09:07: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 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 6147E61760; Thu, 22 Feb 2018 09:03:52 +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 DE64861727; Thu, 22 Feb 2018 09:03:42 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 4AE5D61776 for ; Thu, 22 Feb 2018 09:02:01 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 4B97743046B6 for ; Thu, 22 Feb 2018 12:00:19 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id yZOJwISXCO-0JNmebwu; Thu, 22 Feb 2018 12:00:19 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qk3Eeopztj-0IHOLugM; Thu, 22 Feb 2018 12:00:18 +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: Thu, 22 Feb 2018 12:00:09 +0300 Message-Id: <1519290010-13383-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519290010-13383-1-git-send-email-odpbot@yandex.ru> References: <1519290010-13383-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v1 6/7] validation: move traffic_mngr test to api/ dir 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 496 (lumag:tests-fix-2) ** https://github.com/Linaro/odp/pull/496 ** Patch: https://github.com/Linaro/odp/pull/496.patch ** Base sha: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: 2ca48deb89c7ac000bd44a1da037c36de66720cb **/ test/m4/configure.m4 | 3 +-- test/validation/api/.gitignore | 1 + test/validation/api/Makefile.am | 14 ++++++++++---- test/validation/api/{traffic_mngr => }/traffic_mngr.c | 0 test/validation/api/{traffic_mngr => }/traffic_mngr.sh | 4 ++-- test/validation/api/traffic_mngr/.gitignore | 1 - test/validation/api/traffic_mngr/Makefile.am | 10 ---------- 7 files changed, 14 insertions(+), 19 deletions(-) rename test/validation/api/{traffic_mngr => }/traffic_mngr.c (100%) rename test/validation/api/{traffic_mngr => }/traffic_mngr.sh (90%) delete mode 100644 test/validation/api/traffic_mngr/.gitignore delete mode 100644 test/validation/api/traffic_mngr/Makefile.am diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 5a0b4d685..18c71d799 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -8,5 +8,4 @@ AC_CONFIG_FILES([test/Makefile test/performance/Makefile test/validation/Makefile test/validation/api/Makefile - test/validation/api/pktio/Makefile - test/validation/api/traffic_mngr/Makefile]) + test/validation/api/pktio/Makefile]) diff --git a/test/validation/api/.gitignore b/test/validation/api/.gitignore index 6fb6ee62e..f6bf6e54b 100644 --- a/test/validation/api/.gitignore +++ b/test/validation/api/.gitignore @@ -30,3 +30,4 @@ system_main thread_main time_main timer_main +traffic_mngr_main diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index bc3a429d2..b45828c54 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -1,6 +1,5 @@ ODP_MODULES = \ - pktio \ - traffic_mngr + pktio SUBDIRS = $(ODP_MODULES) @@ -35,7 +34,8 @@ test_PROGRAMS = \ system_main \ thread_main \ time_main \ - timer_main + timer_main \ + traffic_mngr_main noinst_LTLIBRARIES = libtestipsec.la libtestipsec_la_SOURCES = \ @@ -79,6 +79,11 @@ thread_main_SOURCES = thread.c thread_main_LDADD = $(LDADD) $(LIBTHRMASK_COMMON) time_main_SOURCES = time.c timer_main_SOURCES = timer.c +traffic_mngr_main_SOURCES = traffic_mngr.c +traffic_mngr_main_LDADD = $(LDADD) -lm + +dist_check_SCRIPTS = traffic_mngr.sh +test_SCRIPTS = $(dist_check_SCRIPTS) classification_main_SOURCES = \ classification_basic.c \ @@ -90,6 +95,7 @@ classification_main_SOURCES = \ classification.h TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +TEST_EXTENSIONS = .sh TESTS = \ atomic_main$(EXEEXT) \ @@ -121,7 +127,7 @@ TESTS = \ thread_main$(EXEEXT) \ time_main$(EXEEXT) \ timer_main$(EXEEXT) \ - traffic_mngr/traffic_mngr.sh + traffic_mngr.sh TESTNAME = validation diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr.c similarity index 100% rename from test/validation/api/traffic_mngr/traffic_mngr.c rename to test/validation/api/traffic_mngr.c diff --git a/test/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr.sh similarity index 90% rename from test/validation/api/traffic_mngr/traffic_mngr.sh rename to test/validation/api/traffic_mngr.sh index c88aa805c..0b5f3a03b 100755 --- a/test/validation/api/traffic_mngr/traffic_mngr.sh +++ b/test/validation/api/traffic_mngr.sh @@ -12,8 +12,8 @@ # -in the validation when running standalone (./traffic_mngr) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/traffic_mngr:$PATH -PATH=$(dirname $0)/../../../../validation/api/traffic_mngr:$PATH +PATH=${TEST_DIR}/api:$PATH +PATH=$(dirname $0)/../../../../validation/api:$PATH PATH=$(dirname $0):$PATH PATH=`pwd`:$PATH diff --git a/test/validation/api/traffic_mngr/.gitignore b/test/validation/api/traffic_mngr/.gitignore deleted file mode 100644 index efd07a27d..000000000 --- a/test/validation/api/traffic_mngr/.gitignore +++ /dev/null @@ -1 +0,0 @@ -traffic_mngr_main diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am deleted file mode 100644 index a9b8550d7..000000000 --- a/test/validation/api/traffic_mngr/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include ../Makefile.inc - -TESTS_ENVIRONMENT += TEST_DIR=${builddir} - -test_PROGRAMS = traffic_mngr_main -traffic_mngr_main_SOURCES = traffic_mngr.c -LDADD += -lm - -dist_check_SCRIPTS = traffic_mngr.sh -test_SCRIPTS = $(dist_check_SCRIPTS)