From patchwork Tue May 10 18:13:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Viktorin X-Patchwork-Id: 12667 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 836EDB461; Tue, 10 May 2016 20:16:03 +0200 (CEST) Received: from wes1-so2.wedos.net (wes1-so2.wedos.net [46.28.106.16]) by dpdk.org (Postfix) with ESMTP id 4DC21B3D6 for ; Tue, 10 May 2016 20:15:56 +0200 (CEST) Received: from pcviktorin.fit.vutbr.cz (pcviktorin.fit.vutbr.cz [147.229.13.147]) by wes1-so2.wedos.net (Postfix) with ESMTPSA id 3r46rD0jwFz3rJ; Tue, 10 May 2016 20:15:56 +0200 (CEST) From: Jan Viktorin To: dev@dpdk.org Cc: Jan Viktorin , Thomas Monjalon , David Marchand , Bruce Richardson Date: Tue, 10 May 2016 20:13:28 +0200 Message-Id: <1462904011-29838-9-git-send-email-viktorin@rehivetech.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1462904011-29838-1-git-send-email-viktorin@rehivetech.com> References: <1462904011-29838-1-git-send-email-viktorin@rehivetech.com> In-Reply-To: <1461935496-20367-1-git-send-email-viktorin@rehivetech.com> References: <1461935496-20367-1-git-send-email-viktorin@rehivetech.com> Subject: [dpdk-dev] [PATCH v2 08/11] app/test: convert current pci_test into a single test case X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The current test_pci is just a single test case that tests the blacklisting of devices. Rename it to test_pci_blacklist and call it from the test_pci. Signed-off-by: Jan Viktorin --- app/test/test_pci.c | 85 +++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/app/test/test_pci.c b/app/test/test_pci.c index 9d53ba5..2e2fd70 100644 --- a/app/test/test_pci.c +++ b/app/test/test_pci.c @@ -144,51 +144,14 @@ static void free_devargs_list(void) } } -/* real drivers (not used for testing) */ -struct pci_driver_list real_pci_driver_list = - TAILQ_HEAD_INITIALIZER(real_pci_driver_list); - static int -test_pci_setup(void) -{ - struct rte_pci_driver *dr; - - /* Unregister original driver list */ - while (!TAILQ_EMPTY(&pci_driver_list)) { - dr = TAILQ_FIRST(&pci_driver_list); - rte_eal_pci_unregister(dr); - TAILQ_INSERT_TAIL(&real_pci_driver_list, dr, next); - } - - return 0; -} - -static int -test_pci_cleanup(void) -{ - struct rte_pci_driver *dr; - - /* Restore original driver list */ - while (!TAILQ_EMPTY(&real_pci_driver_list)) { - dr = TAILQ_FIRST(&real_pci_driver_list); - TAILQ_REMOVE(&real_pci_driver_list, dr, next); - rte_eal_pci_register(dr); - } - - return 0; -} - -int -test_pci(void) +test_pci_blacklist(void) { struct rte_devargs_list save_devargs_list; printf("Dump all devices\n"); rte_eal_pci_dump(stdout); - if (test_pci_setup()) - return -1; - rte_eal_pci_register(&my_driver); rte_eal_pci_register(&my_driver2); @@ -224,6 +187,52 @@ test_pci(void) rte_eal_pci_unregister(&my_driver); rte_eal_pci_unregister(&my_driver2); + return 0; +} + +/* real drivers (not used for testing) */ +struct pci_driver_list real_pci_driver_list = + TAILQ_HEAD_INITIALIZER(real_pci_driver_list); + +static int +test_pci_setup(void) +{ + struct rte_pci_driver *dr; + + /* Unregister original driver list */ + while (!TAILQ_EMPTY(&pci_driver_list)) { + dr = TAILQ_FIRST(&pci_driver_list); + rte_eal_pci_unregister(dr); + TAILQ_INSERT_TAIL(&real_pci_driver_list, dr, next); + } + + return 0; +} + +static int +test_pci_cleanup(void) +{ + struct rte_pci_driver *dr; + + /* Restore original driver list */ + while (!TAILQ_EMPTY(&real_pci_driver_list)) { + dr = TAILQ_FIRST(&real_pci_driver_list); + TAILQ_REMOVE(&real_pci_driver_list, dr, next); + rte_eal_pci_register(dr); + } + + return 0; +} + +int +test_pci(void) +{ + if (test_pci_setup()) + return -1; + + if (test_pci_blacklist()) + return -1; + if (test_pci_cleanup()) return -1;