From patchwork Tue Mar 20 23:20:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 36332 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AB9CB19F5; Wed, 21 Mar 2018 00:20:44 +0100 (CET) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 7452A5F72 for ; Wed, 21 Mar 2018 00:20:41 +0100 (CET) Received: by mail-wm0-f67.google.com with SMTP id l16so6643189wmh.3 for ; Tue, 20 Mar 2018 16:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=78xiebBCBSwE+SLcavrhi1wXX0vbqQ8ERp2tfYPQKpQ=; b=Y+TC1PxRco9r2k/7Bg5bo1a5C+LKLzjW2JJ+bd6Mb3YyRljI7rkuWbDMWz0OVTsCiX AWS6VNlHslCH6zdNLsuYTWrG7lLprRj1XpO3/Ohvf5xtsIF4gyuvqnVMQEH4WAcVEbTY POcM5mM3FbjSDeM3SzCbeNdVZKD6qzCx5VCrdPcywqfkhTzhj0Mpkxfeck2fVgD4/gOs +QnkUqz1YXCZ1+kULVZKsJF8UnDlQBWC1QHY0jRZcIEKR49lMu+Y4o1jQZxhFld7QLNA KnJxW7ghRzamyAqjdZGtYpgdDXXqVQW/O4dUfB95bluAIyFFIESndwDTfrlvjTEnleu7 e1tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=78xiebBCBSwE+SLcavrhi1wXX0vbqQ8ERp2tfYPQKpQ=; b=E4+pxcGHRxS3YOPaQjxsIVoi8lmI9fWRs7sme6PSyjnONt4MtEEkBRDrSeIUBPAX6L hfysD0LELS6ibYOsw4LTU/orMKXdvBimrpekDBMx2fq5Yct5yf0rLaJ+zWqefs1gSx01 //tNMDFP969A5V/G9BMPtKAx6rHeh3g2YYHBgJQd+uwdx9ybr6M1Dyhs1kDXLRCnuIyF lISEg+wJPjVnhE4DVjEnwBHw7euR0xuXVg2i2L57azpJYcw8dbSwpkmDupeBoC1Jib/d 4fn3pByqsUIG2xENEWjOe7imKRJVIxQlCWOsQ/z7cQxbMPEE1sNMLLynC/x8nP2OvJtY /MTA== X-Gm-Message-State: AElRT7GzntmDttEembDNKDtugdcMvvQvh9qozcFsAmaICpMtW00qiEqb 3YjkSG35RfTVm8LJ229whkwyQyq1 X-Google-Smtp-Source: AG47ELuVvYF8VkySIp1OP50HJLVMvmljCopwknE4gXFVV/PJI7uAJoFDUgbXlVFScr4i+arTxRS62A== X-Received: by 10.28.160.9 with SMTP id j9mr1068523wme.51.1521588040652; Tue, 20 Mar 2018 16:20:40 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id m135sm3983479wma.2.2018.03.20.16.20.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 16:20:39 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 21 Mar 2018 00:20:07 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 06/10] test: remove devargs unit tests X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The current test will not be compatible anymore with a private devargs list. Moreover, the new functions should have new tests, while the existing API will be removed. The current unit tests are thus obsolete and hereby removed. Signed-off-by: Gaetan Rivet --- MAINTAINERS | 1 - test/test/Makefile | 1 - test/test/test_devargs.c | 103 ----------------------------------------------- 3 files changed, 105 deletions(-) delete mode 100644 test/test/test_devargs.c diff --git a/MAINTAINERS b/MAINTAINERS index a646ca3e1..c07931d13 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -113,7 +113,6 @@ F: test/test/test_common.c F: test/test/test_cpuflags.c F: test/test/test_cycles.c F: test/test/test_debug.c -F: test/test/test_devargs.c F: test/test/test_eal* F: test/test/test_errno.c F: test/test/test_interrupts.c diff --git a/test/test/Makefile b/test/test/Makefile index a88cc38bf..035b073b7 100644 --- a/test/test/Makefile +++ b/test/test/Makefile @@ -161,7 +161,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor_perf.c SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c -SRCS-y += test_devargs.c SRCS-y += virtual_pmd.c SRCS-y += packet_burst_generator.c SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c diff --git a/test/test/test_devargs.c b/test/test/test_devargs.c deleted file mode 100644 index b8f3146f6..000000000 --- a/test/test/test_devargs.c +++ /dev/null @@ -1,103 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2014 6WIND S.A. - */ - -#include -#include -#include -#include - -#include -#include - -#include "test.h" - -/* clear devargs list that was modified by the test */ -static void free_devargs_list(void) -{ - struct rte_devargs *devargs; - - while (!TAILQ_EMPTY(&devargs_list)) { - devargs = TAILQ_FIRST(&devargs_list); - TAILQ_REMOVE(&devargs_list, devargs, next); - free(devargs->args); - free(devargs); - } -} - -static int -test_devargs(void) -{ - struct rte_devargs_list save_devargs_list; - struct rte_devargs *devargs; - - /* save the real devargs_list, it is restored at the end of the test */ - save_devargs_list = devargs_list; - TAILQ_INIT(&devargs_list); - - /* test valid cases */ - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "08:00.1") < 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "0000:5:00.0") < 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI, "04:00.0,arg=val") < 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI, "0000:01:00.1") < 0) - goto fail; - if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 2) - goto fail; - if (rte_eal_devargs_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 2) - goto fail; - if (rte_eal_devargs_type_count(RTE_DEVTYPE_VIRTUAL) != 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "net_ring0") < 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "net_ring1,key=val,k2=val2") < 0) - goto fail; - if (rte_eal_devargs_type_count(RTE_DEVTYPE_VIRTUAL) != 2) - goto fail; - free_devargs_list(); - - /* check virtual device with argument parsing */ - if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "net_ring1,k1=val,k2=val2") < 0) - goto fail; - devargs = TAILQ_FIRST(&devargs_list); - if (strncmp(devargs->name, "net_ring1", - sizeof(devargs->name)) != 0) - goto fail; - if (!devargs->args || strcmp(devargs->args, "k1=val,k2=val2") != 0) - goto fail; - free_devargs_list(); - - /* check PCI device with empty argument parsing */ - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "04:00.1") < 0) - goto fail; - devargs = TAILQ_FIRST(&devargs_list); - if (strcmp(devargs->name, "04:00.1") != 0) - goto fail; - if (!devargs->args || strcmp(devargs->args, "") != 0) - goto fail; - free_devargs_list(); - - /* test error case: bad PCI address */ - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "08:1") == 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "00.1") == 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "foo") == 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, ",") == 0) - goto fail; - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "000f:0:0") == 0) - goto fail; - - devargs_list = save_devargs_list; - return 0; - - fail: - free_devargs_list(); - devargs_list = save_devargs_list; - return -1; -} - -REGISTER_TEST_COMMAND(devargs_autotest, test_devargs);