test: remove devargs unit tests

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 <gaetan.rivet@6wind.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>

diff --git a/MAINTAINERS b/MAINTAINERS
index 645bd52..1857bfd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -145,7 +145,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 c9c007c..2630ab4 100644 (file)
--- 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/meson.build b/test/test/meson.build
index eb3d87a..ad0a650 100644 (file)
--- a/test/test/meson.build
+++ b/test/test/meson.build
@@ -24,7 +24,6 @@ test_sources = files('commands.c',
        'test_cryptodev_blockcipher.c',
        'test_cycles.c',
        'test_debug.c',
-       'test_devargs.c',
        'test_distributor.c',
        'test_distributor_perf.c',
        'test_eal_flags.c',

diff --git a/test/test/test_devargs.c b/test/test/test_devargs.c
deleted file mode 100644 (file)
index b8f3146..0000000
--- a/test/test/test_devargs.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2014 6WIND S.A.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/queue.h>
-
-#include <rte_debug.h>
-#include <rte_devargs.h>
-
-#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);