app/test: convert all tests to register system

Remove all tests from the builtin commands list and use the dynamic commands
list register macro.

Signed-off-by: David Marchand <david.marchand@6wind.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>

diff --git a/app/test/commands.c b/app/test/commands.c
index a1ffd43b6daa7d00560279464a0ba1bb54b97bcf..0640ac9881bd8d80dada2d02c555d0547a814b24 100644 (file)
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -104,122 +104,6 @@ static void cmd_autotest_parsed(void *parsed_result,
                        ret = t->callback();
        }
 
-       if (!strcmp(res->autotest, "version_autotest"))
-               ret = test_version();
-       if (!strcmp(res->autotest, "eal_fs_autotest"))
-               ret = test_eal_fs();
-       if (!strcmp(res->autotest, "debug_autotest"))
-               ret = test_debug();
-       if (!strcmp(res->autotest, "pci_autotest"))
-               ret = test_pci();
-       if (!strcmp(res->autotest, "prefetch_autotest"))
-               ret = test_prefetch();
-       if (!strcmp(res->autotest, "byteorder_autotest"))
-               ret = test_byteorder();
-       if (!strcmp(res->autotest, "per_lcore_autotest"))
-               ret = test_per_lcore();
-       if (!strcmp(res->autotest, "atomic_autotest"))
-               ret = test_atomic();
-       if (!strcmp(res->autotest, "malloc_autotest"))
-               ret = test_malloc();
-       if (!strcmp(res->autotest, "spinlock_autotest"))
-               ret = test_spinlock();
-       if (!strcmp(res->autotest, "memory_autotest"))
-               ret = test_memory();
-       if (!strcmp(res->autotest, "memzone_autotest"))
-               ret = test_memzone();
-       if (!strcmp(res->autotest, "rwlock_autotest"))
-               ret = test_rwlock();
-       if (!strcmp(res->autotest, "mbuf_autotest"))
-               ret = test_mbuf();
-       if (!strcmp(res->autotest, "logs_autotest"))
-               ret = test_logs();
-       if (!strcmp(res->autotest, "errno_autotest"))
-               ret = test_errno();
-       if (!strcmp(res->autotest, "hash_autotest"))
-               ret = test_hash();
-       if (!strcmp(res->autotest, "hash_perf_autotest"))
-               ret = test_hash_perf();
-       if (!strcmp(res->autotest, "lpm_autotest"))
-               ret = test_lpm();
-       if (!strcmp(res->autotest, "lpm6_autotest"))
-               ret = test_lpm6();
-       if (!strcmp(res->autotest, "cpuflags_autotest"))
-               ret = test_cpuflags();
-       if (!strcmp(res->autotest, "cmdline_autotest"))
-               ret = test_cmdline();
-       if (!strcmp(res->autotest, "tailq_autotest"))
-               ret = test_tailq();
-       if (!strcmp(res->autotest, "multiprocess_autotest"))
-               ret = test_mp_secondary();
-       if (!strcmp(res->autotest, "memcpy_autotest"))
-               ret = test_memcpy();
-       if (!strcmp(res->autotest, "string_autotest"))
-               ret = test_string_fns();
-       if (!strcmp(res->autotest, "eal_flags_autotest"))
-               ret = test_eal_flags();
-       if (!strcmp(res->autotest, "alarm_autotest"))
-               ret = test_alarm();
-       if (!strcmp(res->autotest, "interrupt_autotest"))
-               ret = test_interrupt();
-       if (!strcmp(res->autotest, "cycles_autotest"))
-               ret = test_cycles();
-       if (!strcmp(res->autotest, "ring_autotest"))
-               ret = test_ring();
-       if (!strcmp(res->autotest, "table_autotest"))
-               ret = test_table();
-       if (!strcmp(res->autotest, "ring_perf_autotest"))
-               ret = test_ring_perf();
-       if (!strcmp(res->autotest, "timer_autotest"))
-               ret = test_timer();
-       if (!strcmp(res->autotest, "timer_perf_autotest"))
-               ret = test_timer_perf();
-#ifdef RTE_LIBRTE_PMD_BOND
-       if (!strcmp(res->autotest, "link_bonding_autotest"))
-               ret = test_link_bonding();
-#endif
-       if (!strcmp(res->autotest, "mempool_autotest"))
-               ret = test_mempool();
-       if (!strcmp(res->autotest, "mempool_perf_autotest"))
-               ret = test_mempool_perf();
-       if (!strcmp(res->autotest, "memcpy_perf_autotest"))
-               ret = test_memcpy_perf();
-       if (!strcmp(res->autotest, "func_reentrancy_autotest"))
-               ret = test_func_reentrancy();
-       if (!strcmp(res->autotest, "red_autotest"))
-               ret = test_red();
-       if (!strcmp(res->autotest, "sched_autotest"))
-               ret = test_sched();
-       if (!strcmp(res->autotest, "meter_autotest"))
-               ret = test_meter();
-       if (!strcmp(res->autotest, "kni_autotest"))
-               ret = test_kni();
-       if (!strcmp(res->autotest, "power_autotest"))
-               ret = test_power();
-       if (!strcmp(res->autotest, "common_autotest"))
-               ret = test_common();
-       if (!strcmp(res->autotest, "ivshmem_autotest"))
-               ret = test_ivshmem();
-       if (!strcmp(res->autotest, "distributor_autotest"))
-               ret = test_distributor();
-       if (!strcmp(res->autotest, "distributor_perf_autotest"))
-               ret = test_distributor_perf();
-       if (!strcmp(res->autotest, "devargs_autotest"))
-               ret = test_devargs();
-#ifdef RTE_LIBRTE_PMD_RING
-       if (!strcmp(res->autotest, "ring_pmd_autotest"))
-               ret = test_pmd_ring();
-#endif /* RTE_LIBRTE_PMD_RING */
-
-#ifdef RTE_LIBRTE_ACL
-       if (!strcmp(res->autotest, "acl_autotest"))
-               ret = test_acl();
-#endif /* RTE_LIBRTE_ACL */
-#ifdef RTE_LIBRTE_KVARGS
-       if (!strcmp(res->autotest, "kvargs_autotest"))
-               ret |= test_kvargs();
-#endif /* RTE_LIBRTE_KVARGS */
-
        if (ret == 0)
                printf("Test OK\n");
        else
@@ -440,46 +324,7 @@ cmdline_parse_ctx_t main_ctx[] = {
 int commands_init(void)
 {
        struct test_command *t;
-       char builtin_commands[] =
-                       "pci_autotest#memory_autotest#"
-                       "per_lcore_autotest#spinlock_autotest#"
-                       "rwlock_autotest#atomic_autotest#"
-                       "byteorder_autotest#prefetch_autotest#"
-                       "cycles_autotest#logs_autotest#"
-                       "memzone_autotest#ring_autotest#"
-                       "mempool_autotest#mbuf_autotest#"
-                       "timer_autotest#malloc_autotest#"
-                       "memcpy_autotest#hash_autotest#"
-                       "lpm_autotest#debug_autotest#"
-                       "lpm6_autotest#"
-                       "errno_autotest#tailq_autotest#"
-                       "string_autotest#multiprocess_autotest#"
-                       "cpuflags_autotest#eal_flags_autotest#"
-                       "alarm_autotest#interrupt_autotest#"
-                       "version_autotest#eal_fs_autotest#"
-                       "cmdline_autotest#func_reentrancy_autotest#"
-#ifdef RTE_LIBRTE_PMD_BOND
-                       "link_bonding_autotest#"
-#endif
-                       "mempool_perf_autotest#hash_perf_autotest#"
-                       "memcpy_perf_autotest#ring_perf_autotest#"
-                       "red_autotest#meter_autotest#sched_autotest#"
-                       "memcpy_perf_autotest#kni_autotest#"
-                       "ivshmem_autotest#"
-                       "devargs_autotest#table_autotest#"
-#ifdef RTE_LIBRTE_ACL
-                       "acl_autotest#"
-#endif
-                       "power_autotest#"
-                       "timer_perf_autotest#"
-#ifdef RTE_LIBRTE_PMD_RING
-                       "ring_pmd_autotest#"
-#endif
-#ifdef RTE_LIBRTE_KVARGS
-                       "kvargs_autotest#"
-#endif
-                       "common_autotest#"
-                       "distributor_autotest#distributor_perf_autotest";
+       char builtin_commands[] = "";
        char *commands, *ptr;
        int commands_len = strlen(builtin_commands) + 1;
 

diff --git a/app/test/test.c b/app/test/test.c
index a33b2b5c44a71bf13db867b1db41760bf0f21c93..9bee6bb47ae2e74ea0f6f6935fb238cf906e49f7 100644 (file)
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -96,7 +96,9 @@ do_recursive_call(void)
                        { "test_memory_flags", no_action },
                        { "test_file_prefix", no_action },
                        { "test_no_huge_flag", no_action },
+#ifdef RTE_LIBRTE_IVSHMEM
                        { "test_ivshmem", test_ivshmem },
+#endif
        };
 
        if (recursive_call == NULL)

diff --git a/app/test/test.h b/app/test/test.h
index bba0ec52242751058192a0b98e70ff0591f94b5a..98ab804955baae43d4598ac8ef907e5f61dc3cc0 100644 (file)
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -132,60 +132,11 @@ int commands_init(void);
 int main(int argc, char **argv);
 
 int test_pci(void);
-int test_memory(void);
-int test_per_lcore(void);
-int test_spinlock(void);
-int test_rwlock(void);
-int test_atomic(void);
-int test_byteorder(void);
-int test_prefetch(void);
-int test_cycles(void);
-int test_logs(void);
-int test_memzone(void);
-int test_ring(void);
-int test_table(void);
-int test_ring_perf(void);
-int test_mempool(void);
-int test_mempool_perf(void);
-int test_mbuf(void);
-int test_timer(void);
-int test_timer_perf(void);
-int test_malloc(void);
-int test_memcpy(void);
-int test_memcpy_perf(void);
-int test_hash(void);
-int test_hash_perf(void);
-int test_lpm(void);
-int test_lpm6(void);
-int test_debug(void);
-int test_errno(void);
-int test_tailq(void);
-int test_string_fns(void);
+int test_pci_run;
+
 int test_mp_secondary(void);
-int test_cpuflags(void);
-int test_eal_flags(void);
-int test_alarm(void);
-int test_interrupt(void);
-int test_version(void);
-int test_eal_fs(void);
-int test_cmdline(void);
-int test_func_reentrancy(void);
-int test_red(void);
-int test_sched(void);
-int test_meter(void);
-int test_acl(void);
-int test_kni(void);
-int test_power(void);
-int test_common(void);
-int test_pmd_ring(void);
-int test_ivshmem(void);
-int test_distributor(void);
-int test_distributor_perf(void);
-int test_kvargs(void);
-int test_devargs(void);
-int test_link_bonding(void);
 
-int test_pci_run;
+int test_ivshmem(void);
 
 typedef int (test_callback)(void);
 TAILQ_HEAD(test_commands_list, test_command);

diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 869f6d32e115c9daafa1c72c006ae7d50a935dc6..4e7b470984854ca971084247d3a2118efe66efb6 100644 (file)
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -910,7 +910,7 @@ test_misc(void)
        return 0;
 }
 
-int
+static int
 test_acl(void)
 {
        if (test_invalid_parameters() < 0)
@@ -928,13 +928,10 @@ test_acl(void)
 
        return 0;
 }
-#else
-
-int
-test_acl(void)
-{
-       printf("This binary was not compiled with ACL support!\n");
-       return 0;
-}
 
+static struct test_command acl_cmd = {
+       .command = "acl_autotest",
+       .callback = test_acl,
+};
+REGISTER_TEST_COMMAND(acl_cmd);
 #endif /* RTE_LIBRTE_ACL */

diff --git a/app/test/test_alarm.c b/app/test/test_alarm.c
index d5bea5e56afd16b73fb951d1a12cbacc53df3f4b..5d6f4a27eb81a8bea3b9dfda5b0b5c92f6a8e277 100644 (file)
--- a/app/test/test_alarm.c
+++ b/app/test/test_alarm.c
@@ -199,7 +199,7 @@ test_multi_alarms(void)
        return 0;
 }
 
-int
+static int
 test_alarm(void)
 {
        int count = 0;
@@ -253,3 +253,8 @@ test_alarm(void)
        return 0;
 }
 
+static struct test_command alarm_cmd = {
+       .command = "alarm_autotest",
+       .callback = test_alarm,
+};
+REGISTER_TEST_COMMAND(alarm_cmd);

diff --git a/app/test/test_atomic.c b/app/test/test_atomic.c
index 141cc229bd8f33fab20a3be5a78761e769810947..33474137d5c2fc4d50618c836d915003123264b5 100644 (file)
--- a/app/test/test_atomic.c
+++ b/app/test/test_atomic.c
@@ -248,7 +248,7 @@ test_atomic_dec_and_test(__attribute__((unused)) void *arg)
        return 0;
 }
 
-int
+static int
 test_atomic(void)
 {
        rte_atomic16_init(&a16);
@@ -375,3 +375,8 @@ test_atomic(void)
        return 0;
 }
 
+static struct test_command atomic_cmd = {
+       .command = "atomic_autotest",
+       .callback = test_atomic,
+};
+REGISTER_TEST_COMMAND(atomic_cmd);

diff --git a/app/test/test_byteorder.c b/app/test/test_byteorder.c
index 38f8d39459cc3591cdce3ab13bf22bb596deeee6..a088489bdb32af102a6b6db58c17ebb95549c012 100644 (file)
--- a/app/test/test_byteorder.c
+++ b/app/test/test_byteorder.c
@@ -52,7 +52,7 @@ static volatile uint64_t u64 = 0xdeadcafebabefaceULL;
  *   size (16, 32, 64 bits)
  */
 
-int
+static int
 test_byteorder(void)
 {
        uint16_t res_u16;
@@ -91,3 +91,9 @@ test_byteorder(void)
 
        return 0;
 }
+
+static struct test_command byteorder_cmd = {
+       .command = "byteorder_autotest",
+       .callback = test_byteorder,
+};
+REGISTER_TEST_COMMAND(byteorder_cmd);

diff --git a/app/test/test_cmdline.c b/app/test/test_cmdline.c
index 10a3f774aead25e9cfbb19f1e9b73b5c5cbb418f..9b8bd5c07cd2f6ebeae4322624c536577bb1a9ac 100644 (file)
--- a/app/test/test_cmdline.c
+++ b/app/test/test_cmdline.c
@@ -36,10 +36,10 @@
 #include "test.h"
 #include "test_cmdline.h"
 
-int
+#ifdef RTE_LIBRTE_CMDLINE
+static int
 test_cmdline(void)
 {
-#ifdef RTE_LIBRTE_CMDLINE
        printf("Testind parsing ethernet addresses...\n");
        if (test_parse_etheraddr_valid() < 0)
                return -1;
@@ -87,9 +87,12 @@ test_cmdline(void)
        printf("Testing library functions...\n");
        if (test_cmdline_lib() < 0)
                return -1;
-#else
-       printf("The cmdline library is not included in this build\n");
-#endif
        return 0;
 }
 
+static struct test_command cmdline_cmd = {
+       .command = "cmdline_autotest",
+       .callback = test_cmdline,
+};
+REGISTER_TEST_COMMAND(cmdline_cmd);
+#endif

diff --git a/app/test/test_common.c b/app/test/test_common.c
index 628201beb0d467e5d3342af9be1236a9eca3eeca..4b71e7b8820ce8f604dfcbb874d7926a3430bea5 100644 (file)
--- a/app/test/test_common.c
+++ b/app/test/test_common.c
@@ -158,7 +158,7 @@ test_align(void)
        return 0;
 }
 
-int
+static int
 test_common(void)
 {
        int ret = 0;
@@ -168,3 +168,9 @@ test_common(void)
 
        return ret;
 }
+
+static struct test_command common_cmd = {
+       .command = "common_autotest",
+       .callback = test_common,
+};
+REGISTER_TEST_COMMAND(common_cmd);

diff --git a/app/test/test_cpuflags.c b/app/test/test_cpuflags.c
index cb49384a54dbf729ecf7ddfb80a326889ae6ee57..82c019707cdd709360b4969db50eed31013a2fff 100644 (file)
--- a/app/test/test_cpuflags.c
+++ b/app/test/test_cpuflags.c
@@ -74,7 +74,7 @@ cpu_flag_result(int result)
  * - Check if register and CPUID functions fail properly
  */
 
-int
+static int
 test_cpuflags(void)
 {
        int result;
@@ -129,3 +129,9 @@ test_cpuflags(void)
 
        return 0;
 }
+
+static struct test_command cpuflags_cmd = {
+       .command = "cpuflags_autotest",
+       .callback = test_cpuflags,
+};
+REGISTER_TEST_COMMAND(cpuflags_cmd);

diff --git a/app/test/test_cycles.c b/app/test/test_cycles.c
index b8d66a09f53d20a11084bce70bf1d59b8e1dfc82..d8fa5171be66da28108f0142e50c58a9060da6be 100644 (file)
--- a/app/test/test_cycles.c
+++ b/app/test/test_cycles.c
@@ -52,7 +52,7 @@
  *   of cycles is correct with regard to the frequency of the timer.
  */
 
-int
+static int
 test_cycles(void)
 {
        unsigned i;
@@ -88,3 +88,9 @@ test_cycles(void)
 
        return 0;
 }
+
+static struct test_command cycles_cmd = {
+       .command = "cycles_autotest",
+       .callback = test_cycles,
+};
+REGISTER_TEST_COMMAND(cycles_cmd);

diff --git a/app/test/test_debug.c b/app/test/test_debug.c
index 135b75db25d5ee1676f2fce97e3c2171556dc5b7..4659e469ebbb3d39837888273c4891b7501b197b 100644 (file)
--- a/app/test/test_debug.c
+++ b/app/test/test_debug.c
@@ -156,7 +156,7 @@ test_usage(void)
        return 0;
 }
 
-int
+static int
 test_debug(void)
 {
        rte_dump_stack();
@@ -169,3 +169,9 @@ test_debug(void)
                return -1;
        return 0;
 }
+
+static struct test_command debug_cmd = {
+       .command = "debug_autotest",
+       .callback = test_debug,
+};
+REGISTER_TEST_COMMAND(debug_cmd);

diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c
index 63eee0b58037faa68c4896fbae317a14555f1896..f0acf8e3f63b68282cd3193d00a58a765b25093d 100644 (file)
--- a/app/test/test_devargs.c
+++ b/app/test/test_devargs.c
@@ -52,7 +52,7 @@ static void free_devargs_list(void)
        }
 }
 
-int
+static int
 test_devargs(void)
 {
        struct rte_devargs_list save_devargs_list;
@@ -129,3 +129,9 @@ test_devargs(void)
        devargs_list = save_devargs_list;
        return -1;
 }
+
+static struct test_command devargs_cmd = {
+       .command = "devargs_autotest",
+       .callback = test_devargs,
+};
+REGISTER_TEST_COMMAND(devargs_cmd);

diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
index 7648ed1d658d6d26d25d93d2fcbee72314188575..b29bef8cf0682993a0d03ca841f234df49686d9b 100644 (file)
--- a/app/test/test_distributor.c
+++ b/app/test/test_distributor.c
@@ -503,7 +503,7 @@ quit_workers(struct rte_distributor *d, struct rte_mempool *p)
 
 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 
-int
+static int
 test_distributor(void)
 {
        static struct rte_distributor *d;
@@ -581,15 +581,9 @@ err:
        return -1;
 }
 
-#else
-
-#include <stdio.h>
-
-int
-test_distributor(void)
-{
-       printf("Distributor is not enabled in configuration\n");
-       return 0;
-}
-
+static struct test_command distributor_cmd = {
+       .command = "distributor_autotest",
+       .callback = test_distributor,
+};
+REGISTER_TEST_COMMAND(distributor_cmd);
 #endif

diff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c
index 1031baabb4262ae2a60e236fae2b76b81b66e712..8a6b85543815e5fac304c1985eee0925d18a3879 100644 (file)
--- a/app/test/test_distributor_perf.c
+++ b/app/test/test_distributor_perf.c
@@ -212,7 +212,7 @@ quit_workers(struct rte_distributor *d, struct rte_mempool *p)
 
 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 
-int
+static int
 test_distributor_perf(void)
 {
        static struct rte_distributor *d;
@@ -261,15 +261,9 @@ test_distributor_perf(void)
        return 0;
 }
 
-#else
-
-#include <stdio.h>
-
-int
-test_distributor_perf(void)
-{
-       printf("Distributor is not enabled in configuration\n");
-       return 0;
-}
-
+static struct test_command distributor_perf_cmd = {
+       .command = "distributor_perf_autotest",
+       .callback = test_distributor_perf,
+};
+REGISTER_TEST_COMMAND(distributor_perf_cmd);
 #endif

diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 729d4eefea152b05a95701132acdfa9e59891ba9..2d817649239f7345e7559d9f7b61efd807ee5871 100644 (file)
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -1204,7 +1204,7 @@ test_memory_flags(void)
        return 0;
 }
 
-int
+static int
 test_eal_flags(void)
 {
        int ret = 0;
@@ -1283,15 +1283,9 @@ test_eal_flags(void)
        return ret;
 }
 
-#else
-/* Baremetal version
- * Multiprocess not applicable, so just return 0 always
- */
-int
-test_eal_flags(void)
-{
-       printf("Multi-process not possible for baremetal, cannot test EAL flags\n");
-       return 0;
-}
-
+static struct test_command eal_flags_cmd = {
+       .command = "eal_flags_autotest",
+       .callback = test_eal_flags,
+};
+REGISTER_TEST_COMMAND(eal_flags_cmd);
 #endif

diff --git a/app/test/test_eal_fs.c b/app/test/test_eal_fs.c
index b28ca6c4789ae65105a23a14d72a3c3553a2647b..8d4edc1da6d4c90df563d16d5236d1f3b136bf18 100644 (file)
--- a/app/test/test_eal_fs.c
+++ b/app/test/test_eal_fs.c
@@ -196,18 +196,17 @@ error:
        return -1;
 }
 
-int
+static int
 test_eal_fs(void)
 {
        if (test_parse_sysfs_value() < 0)
                return -1;
        return 0;
 }
-#else
-/* baremetal does not have a filesystem */
-int
-test_eal_fs(void)
-{
-       return 0;
-}
+
+static struct test_command eal_fs_cmd = {
+       .command = "eal_fs_autotest",
+       .callback = test_eal_fs,
+};
+REGISTER_TEST_COMMAND(eal_fs_cmd);
 #endif

diff --git a/app/test/test_errno.c b/app/test/test_errno.c
index 93ad0b5a2383a1900779de8488862364e8a4cd56..c903b196fc71c1da30e93ea61b0968240c788b35 100644 (file)
--- a/app/test/test_errno.c
+++ b/app/test/test_errno.c
@@ -42,7 +42,7 @@
 
 #include "test.h"
 
-int
+static int
 test_errno(void)
 {
        const char *rte_retval;
@@ -112,3 +112,9 @@ test_errno(void)
 
        return 0;
 }
+
+static struct test_command errno_cmd = {
+       .command = "errno_autotest",
+       .callback = test_errno,
+};
+REGISTER_TEST_COMMAND(errno_cmd);

diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index 0955b0a27cc87320f6d2e6fdabf98b01f356f382..45928fa56301b2842974653053ab203e49363468 100644 (file)
--- a/app/test/test_func_reentrancy.c
+++ b/app/test/test_func_reentrancy.c
@@ -465,7 +465,7 @@ launch_test(struct test_case *pt_case)
 /**
  * Main entry of func_reentrancy test
  */
-int
+static int
 test_func_reentrancy(void)
 {
        uint32_t case_id;
@@ -492,3 +492,9 @@ test_func_reentrancy(void)
 
        return 0;
 }
+
+static struct test_command func_reentrancy_cmd = {
+       .command = "func_reentrancy_autotest",
+       .callback = test_func_reentrancy,
+};
+REGISTER_TEST_COMMAND(func_reentrancy_cmd);

diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 87de3c6a3d0982b23d63e1181d395123b2f96bee..ae3238bff28f2c6fede730f308ee4c5660007cd1 100644 (file)
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -1330,7 +1330,8 @@ fail_jhash_3word:
 /*
  * Do all unit and performance tests.
  */
-int test_hash(void)
+static int
+test_hash(void)
 {
        if (test_add_delete() < 0)
                return -1;
@@ -1366,13 +1367,10 @@ int test_hash(void)
 
        return 0;
 }
-#else /* RTE_LIBRTE_HASH */
-
-int
-test_hash(void)
-{
-       printf("The Hash library is not included in this build\n");
-       return 0;
-}
 
+static struct test_command hash_cmd = {
+       .command = "hash_autotest",
+       .callback = test_hash,
+};
+REGISTER_TEST_COMMAND(hash_cmd);
 #endif /* RTE_LIBRTE_HASH */

diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c
index 1e9c16e92a630591850a41c8e35c83b8272f7225..d3e999013c21b457ec2baeebdc5da6b03046c00c 100644 (file)
--- a/app/test/test_hash_perf.c
+++ b/app/test/test_hash_perf.c
@@ -761,7 +761,8 @@ fbk_hash_perf_test(void)
 /*
  * Do all unit and performance tests.
  */
-int test_hash_perf(void)
+static int
+test_hash_perf(void)
 {
        if (run_all_tbl_perf_tests() < 0)
                return -1;
@@ -771,13 +772,10 @@ int test_hash_perf(void)
                return -1;
        return 0;
 }
-#else /* RTE_LIBRTE_HASH */
-
-int
-test_hash_perf(void)
-{
-       printf("The Hash library is not included in this build\n");
-       return 0;
-}
 
+static struct test_command hash_perf_cmd = {
+       .command = "hash_perf_autotest",
+       .callback = test_hash_perf,
+};
+REGISTER_TEST_COMMAND(hash_perf_cmd);
 #endif /* RTE_LIBRTE_HASH */

diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c
index 4563e2b0e507a1619a4107bd770f447a01b23e6f..61fdc56f81673727cdfc693430f399c3ccc1cb81 100644 (file)
--- a/app/test/test_interrupts.c
+++ b/app/test/test_interrupts.c
@@ -395,7 +395,7 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type)
 /**
  * Main function of testing interrupt.
  */
-int
+static int
 test_interrupt(void)
 {
        int ret = -1;
@@ -548,3 +548,8 @@ out:
        return ret;
 }
 
+static struct test_command interrupt_cmd = {
+       .command = "interrupt_autotest",
+       .callback = test_interrupt,
+};
+REGISTER_TEST_COMMAND(interrupt_cmd);

diff --git a/app/test/test_ivshmem.c b/app/test/test_ivshmem.c
index 1404ada0b8c284f43c78d50d8a82d60fe9a5e500..e759939cba6dbff2cd9c909f6ac3c2a8c4293832 100644 (file)
--- a/app/test/test_ivshmem.c
+++ b/app/test/test_ivshmem.c
@@ -431,12 +431,10 @@ test_ivshmem(void)
 
        return -1;
 }
-#else /* RTE_LIBRTE_IVSHMEM */
 
-int
-test_ivshmem(void)
-{
-       printf("This binary was not compiled with IVSHMEM support!\n");
-       return 0;
-}
+static struct test_command ivshmem_cmd = {
+       .command = "ivshmem_autotest",
+       .callback = test_ivshmem,
+};
+REGISTER_TEST_COMMAND(ivshmem_cmd);
 #endif /* RTE_LIBRTE_IVSHMEM */

diff --git a/app/test/test_kni.c b/app/test/test_kni.c
index 962bfad18c5f94167f9d75cab64b687cff22c300..60683d26cffc3b50cbdb93978810b3e8722d92f5 100644 (file)
--- a/app/test/test_kni.c
+++ b/app/test/test_kni.c
@@ -488,7 +488,7 @@ fail_kni:
        return ret;
 }
 
-int
+static int
 test_kni(void)
 {
        int ret = -1;
@@ -680,13 +680,9 @@ fail:
        return ret;
 }
 
-#else /* RTE_LIBRTE_KNI */
-
-int
-test_kni(void)
-{
-       printf("The KNI library is not included in this build\n");
-       return 0;
-}
-
+static struct test_command kni_cmd = {
+       .command = "kni_autotest",
+       .callback = test_kni,
+};
+REGISTER_TEST_COMMAND(kni_cmd);
 #endif /* RTE_LIBRTE_KNI */

diff --git a/app/test/test_kvargs.c b/app/test/test_kvargs.c
index c417ba23485b5bee7acbb01f93531a50fb26abba..b8f5e5ce2b9153595fa44691add3fa58123f8a74 100644 (file)
--- a/app/test/test_kvargs.c
+++ b/app/test/test_kvargs.c
@@ -223,7 +223,8 @@ static int test_invalid_kvargs(void)
        return -1;
 }
 
-int test_kvargs(void)
+static int
+test_kvargs(void)
 {
        printf("== test valid case ==\n");
        if (test_valid_kvargs() < 0)
@@ -233,3 +234,9 @@ int test_kvargs(void)
                return -1;
        return 0;
 }
+
+static struct test_command kvargs_cmd = {
+       .command = "kvargs_autotest",
+       .callback = test_kvargs,
+};
+REGISTER_TEST_COMMAND(kvargs_cmd);

diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index 5c1303eab51923b8be7ce99ec1da63ccda06d157..db5b1808c3bf2139560117e48bc5938e8612eab7 100644 (file)
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -3810,8 +3810,14 @@ static struct unit_test_suite link_bonding_test_suite  = {
 };
 
 
-int
+static int
 test_link_bonding(void)
 {
        return unit_test_suite_runner(&link_bonding_test_suite);
 }
+
+static struct test_command link_bonding_cmd = {
+       .command = "link_bonding_autotest",
+       .callback = test_link_bonding,
+};
+REGISTER_TEST_COMMAND(link_bonding_cmd);

diff --git a/app/test/test_logs.c b/app/test/test_logs.c
index 67daa5b963fc93c8d1cda0d7422bc7edefb113ad..2063c74ca335056c04af66a1e5cbeb78a1ed3ebd 100644 (file)
--- a/app/test/test_logs.c
+++ b/app/test/test_logs.c
@@ -59,7 +59,7 @@
  * - Send logs with different types and levels, some should not be displayed.
  */
 
-int
+static int
 test_logs(void)
 {
        /* enable these logs type */
@@ -90,3 +90,9 @@ test_logs(void)
 
        return 0;
 }
+
+static struct test_command logs_cmd = {
+       .command = "logs_autotest",
+       .callback = test_logs,
+};
+REGISTER_TEST_COMMAND(logs_cmd);

diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index 05f0a935810cb0c3531444483e55f1164802d72b..087d97ae6898d83adb2ced9d4f32ecf8b3f5d4f1 100644 (file)
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -1332,7 +1332,7 @@ perf_test(void)
  * Do all unit and performance tests.
  */
 
-int
+static int
 test_lpm(void)
 {
        unsigned i;
@@ -1349,13 +1349,9 @@ test_lpm(void)
        return global_status;
 }
 
-#else /* RTE_LIBRTE_LPM */
-
-int
-test_lpm(void)
-{
-       printf("The LPM library is not included in this build\n");
-       return 0;
-}
-
+static struct test_command lpm_cmd = {
+       .command = "lpm_autotest",
+       .callback = test_lpm,
+};
+REGISTER_TEST_COMMAND(lpm_cmd);
 #endif /* RTE_LIBRTE_LPM */

diff --git a/app/test/test_lpm6.c b/app/test/test_lpm6.c
index 982930b008e1a6991c5364cdf083c3bf98833124..bd9912500c0bfd912697fd2cc97819b53284f2a6 100644 (file)
--- a/app/test/test_lpm6.c
+++ b/app/test/test_lpm6.c
@@ -1902,7 +1902,7 @@ perf_test(void)
 /*
  * Do all unit and performance tests.
  */
-int
+static int
 test_lpm6(void)
 {
        unsigned i;
@@ -1920,13 +1920,9 @@ test_lpm6(void)
        return global_status;
 }
 
-#else /* RTE_LIBRTE_LPM */
-
-int
-test_lpm6(void)
-{
-        printf("The LPM library is not included in this build\n");
-        return 0;
-}
-
+static struct test_command lpm6_cmd = {
+       .command = "lpm6_autotest",
+       .callback = test_lpm6,
+};
+REGISTER_TEST_COMMAND(lpm6_cmd);
 #endif /* RTE_LIBRTE_LPM */

diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 081715192e82d9369438f45341f95d85064b93a9..ee34ca3bed059c4e3fb37abc6ef6682cccc0fb77 100644 (file)
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -924,7 +924,7 @@ test_alloc_socket(void)
        return 0;
 }
 
-int
+static int
 test_malloc(void)
 {
        unsigned lcore_id;
@@ -1045,3 +1045,9 @@ test_malloc(void)
 
        return 0;
 }
+
+static struct test_command malloc_cmd = {
+       .command = "malloc_autotest",
+       .callback = test_malloc,
+};
+REGISTER_TEST_COMMAND(malloc_cmd);

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 2b875214a12fb7635b1bbbdc9e9fdf0b53cdfd49..21024e7ae5a96a2b5d3282de51dc6ccf1cd5253c 100644 (file)
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -829,7 +829,7 @@ test_failing_mbuf_sanity_check(void)
 #endif
 
 
-int
+static int
 test_mbuf(void)
 {
        RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) != 64);
@@ -927,3 +927,9 @@ test_mbuf(void)
        }
        return 0;
 }
+
+static struct test_command mbuf_cmd = {
+       .command = "mbuf_autotest",
+       .callback = test_mbuf,
+};
+REGISTER_TEST_COMMAND(mbuf_cmd);

diff --git a/app/test/test_memcpy.c b/app/test/test_memcpy.c
index ee0b0da92a9ca0081588239dc6631e172bd47ff0..56b8e1e8e2f27a0f71130bbf7f0f76a38e3d9375 100644 (file)
--- a/app/test/test_memcpy.c
+++ b/app/test/test_memcpy.c
@@ -210,7 +210,7 @@ func_test(void)
        return 0;
 }
 
-int
+static int
 test_memcpy(void)
 {
        int ret;
@@ -223,3 +223,9 @@ test_memcpy(void)
                return -1;
        return 0;
 }
+
+static struct test_command memcpy_cmd = {
+       .command = "memcpy_autotest",
+       .callback = test_memcpy,
+};
+REGISTER_TEST_COMMAND(memcpy_cmd);

diff --git a/app/test/test_memcpy_perf.c b/app/test/test_memcpy_perf.c
index f6b95c9ad311f8fcb0a5487566fed0721c350248..7809610c90c5c592a988bc73f2e560b464573cf1 100644 (file)
--- a/app/test/test_memcpy_perf.c
+++ b/app/test/test_memcpy_perf.c
@@ -278,7 +278,7 @@ perf_test(void)
 }
 
 
-int
+static int
 test_memcpy_perf(void)
 {
        int ret;
@@ -288,3 +288,9 @@ test_memcpy_perf(void)
                return -1;
        return 0;
 }
+
+static struct test_command memcpy_perf_cmd = {
+       .command = "memcpy_perf_autotest",
+       .callback = test_memcpy_perf,
+};
+REGISTER_TEST_COMMAND(memcpy_perf_cmd);

diff --git a/app/test/test_memory.c b/app/test/test_memory.c
index 6c62de85dba9092f51969a04fe81c47d02d42fba..02ef3cfac0ec19b3260a2bd5fc9a11fd871524d8 100644 (file)
--- a/app/test/test_memory.c
+++ b/app/test/test_memory.c
@@ -51,7 +51,7 @@
  * - Try to read all memory; it should not segfault.
  */
 
-int
+static int
 test_memory(void)
 {
        uint64_t s;
@@ -84,3 +84,9 @@ test_memory(void)
 
        return 0;
 }
+
+static struct test_command memory_cmd = {
+       .command = "memory_autotest",
+       .callback = test_memory,
+};
+REGISTER_TEST_COMMAND(memory_cmd);

diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index a83b2eefcd75ccf7fd959dad55e80cc4a7747f0c..303d2b35fc70016c3cb37b65aa3febdf39b895de 100644 (file)
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -455,7 +455,7 @@ test_mempool_xmem_misc(void)
        return (0);
 }
 
-int
+static int
 test_mempool(void)
 {
        rte_atomic32_init(&synchro);
@@ -521,3 +521,9 @@ test_mempool(void)
 
        return 0;
 }
+
+static struct test_command mempool_cmd = {
+       .command = "mempool_autotest",
+       .callback = test_mempool,
+};
+REGISTER_TEST_COMMAND(mempool_cmd);

diff --git a/app/test/test_mempool_perf.c b/app/test/test_mempool_perf.c
index d3141fe9542e0b6bc7568a45e724f9b2f5ca730e..57c0e5ef09e8fc261870f915c3553f4a65e421c0 100644 (file)
--- a/app/test/test_mempool_perf.c
+++ b/app/test/test_mempool_perf.c
@@ -273,7 +273,7 @@ do_one_mempool_test(unsigned cores)
        return 0;
 }
 
-int
+static int
 test_mempool_perf(void)
 {
        rte_atomic32_init(&synchro);
@@ -329,3 +329,9 @@ test_mempool_perf(void)
 
        return 0;
 }
+
+static struct test_command mempool_perf_cmd = {
+       .command = "mempool_perf_autotest",
+       .callback = test_mempool_perf,
+};
+REGISTER_TEST_COMMAND(mempool_perf_cmd);

diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 42c7601fb93820e5bb0f8ba6179270d4cd1581d4..381f643bb459e0a3dc9a5e49a4504d31da11012e 100644 (file)
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -922,7 +922,7 @@ test_memzone_reserve_remainder(void)
        return 0;
 }
 
-int
+static int
 test_memzone(void)
 {
        const struct rte_memzone *memzone1;
@@ -1044,3 +1044,9 @@ test_memzone(void)
 
        return 0;
 }
+
+static struct test_command memzone_cmd = {
+       .command = "memzone_autotest",
+       .callback = test_memzone,
+};
+REGISTER_TEST_COMMAND(memzone_cmd);

diff --git a/app/test/test_meter.c b/app/test/test_meter.c
index 226b2310c0052301c070e14db78fe192742a6fa5..215cbf8d286ca421901c4f868bf72e2775b1644e 100644 (file)
--- a/app/test/test_meter.c
+++ b/app/test/test_meter.c
@@ -471,7 +471,7 @@ tm_test_trtcm_color_aware_check(void)
 /**
  * test main entrance for library meter
  */
-int
+static int
 test_meter(void)
 {
        if(tm_test_srtcm_config() != 0 )
@@ -496,12 +496,9 @@ test_meter(void)
 
 }
 
-#else /* RTE_LIBRTE_METER */
-
-int
-test_meter(void)
-{
-       printf("The meter library is not included in this build\n");
-       return 0;
-}
+static struct test_command meter_cmd = {
+       .command = "meter_autotest",
+       .callback = test_meter,
+};
+REGISTER_TEST_COMMAND(meter_cmd);
 #endif /* RTE_LIBRTE_METER */

diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c
index e739765ab4ade0cd88e46e73622f69172ffaf321..7579e2000a36988bdc23c59d39bf08b206c14fd1 100644 (file)
--- a/app/test/test_mp_secondary.c
+++ b/app/test/test_mp_secondary.c
@@ -265,16 +265,9 @@ test_mp_secondary(void)
        return run_object_creation_tests();
 }
 
-#else
-
-/* Baremetal version
- * Multiprocess not applicable, so just return 0 always
- */
-int
-test_mp_secondary(void)
-{
-       printf("Multi-process not applicable for baremetal\n");
-       return 0;
-}
-
+static struct test_command multiprocess_cmd = {
+       .command = "multiprocess_autotest",
+       .callback = test_mp_secondary,
+};
+REGISTER_TEST_COMMAND(multiprocess_cmd);
 #endif

diff --git a/app/test/test_pci.c b/app/test/test_pci.c
index 40095c6c20a896f23d1bc91b589336e55a9587bd..e834c4d21e97ed9e9fce79b4a4cec530de3ff375 100644 (file)
--- a/app/test/test_pci.c
+++ b/app/test/test_pci.c
@@ -195,3 +195,9 @@ test_pci(void)
 
        return 0;
 }
+
+static struct test_command pci_cmd = {
+       .command = "pci_autotest",
+       .callback = test_pci,
+};
+REGISTER_TEST_COMMAND(pci_cmd);

diff --git a/app/test/test_per_lcore.c b/app/test/test_per_lcore.c
index 2241ed5c8a7e32d889d50e4db98e639a9ea866e0..1a5a2328905afe008c7fdb6835bc807667bef515 100644 (file)
--- a/app/test/test_per_lcore.c
+++ b/app/test/test_per_lcore.c
@@ -99,7 +99,7 @@ test_per_lcore_delay(__attribute__((unused)) void *arg)
        return 0;
 }
 
-int
+static int
 test_per_lcore(void)
 {
        unsigned lcore_id;
@@ -136,3 +136,9 @@ test_per_lcore(void)
 
        return 0;
 }
+
+static struct test_command per_lcore_cmd = {
+       .command = "per_lcore_autotest",
+       .callback = test_per_lcore,
+};
+REGISTER_TEST_COMMAND(per_lcore_cmd);

diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c
index 19ad0e9d32768a64484064f26206845f05b0f41c..6364495206015de7ba840a0010204922bcb081e5 100644 (file)
--- a/app/test/test_pmd_ring.c
+++ b/app/test/test_pmd_ring.c
@@ -405,7 +405,7 @@ test_pmd_ring_pair_create_attach(void)
        return 0;
 }
 
-int
+static int
 test_pmd_ring(void)
 {
        mp = rte_mempool_create("mbuf_pool", NB_MBUF,
@@ -445,13 +445,10 @@ test_pmd_ring(void)
        return 0;
 }
 
-#else
-
-int
-test_pmd_ring(void)
-{
-       return 0;
-}
-
+static struct test_command ring_pmd_cmd = {
+       .command = "ring_pmd_autotest",
+       .callback = test_pmd_ring,
+};
+REGISTER_TEST_COMMAND(ring_pmd_cmd);
 #endif
 

diff --git a/app/test/test_power.c b/app/test/test_power.c
index 94c1cac0040688fc8df0c9778be1093676c5c3c2..123b19981555447ba10ca078934986674db267ef 100644 (file)
--- a/app/test/test_power.c
+++ b/app/test/test_power.c
@@ -379,7 +379,7 @@ check_power_freq_min(void)
        return 0;
 }
 
-int
+static int
 test_power(void)
 {
        int ret = -1;
@@ -477,14 +477,10 @@ fail_all:
        return -1;
 }
 
-#else /* RTE_LIBRTE_POWER */
-
-int
-test_power(void)
-{
-       printf("The power library is not included in this build\n");
-       return 0;
-}
-
+static struct test_command power_cmd = {
+       .command = "power_autotest",
+       .callback = test_power,
+};
+REGISTER_TEST_COMMAND(power_cmd);
 #endif /* RTE_LIBRTE_POWER */
 

diff --git a/app/test/test_prefetch.c b/app/test/test_prefetch.c
index 10039b7228627c0cfc6f46b35b4bd8b687df8837..f8615e2451ae5da6d055cf8d9d988186f3b76050 100644 (file)
--- a/app/test/test_prefetch.c
+++ b/app/test/test_prefetch.c
@@ -46,7 +46,7 @@
  *   The test always return success.
  */
 
-int
+static int
 test_prefetch(void)
 {
        int a;
@@ -57,3 +57,9 @@ test_prefetch(void)
 
        return 0;
 }
+
+static struct test_command prefetch_cmd = {
+       .command = "prefetch_autotest",
+       .callback = test_prefetch,
+};
+REGISTER_TEST_COMMAND(prefetch_cmd);

diff --git a/app/test/test_red.c b/app/test/test_red.c
index bb62aba09516f294fad87fc6ee76d975a5bee66c..7cf2221d84b5983f3968f3e232a9a8b57f423cc6 100644 (file)
--- a/app/test/test_red.c
+++ b/app/test/test_red.c
@@ -1861,7 +1861,8 @@ test_invalid_parameters(void)
        return 0;
 }
 
-int test_red(void)
+static int
+test_red(void)
 {
        uint32_t num_tests = 0;
        uint32_t num_pass = 0;
@@ -1883,13 +1884,9 @@ int test_red(void)
        return (ret);
 }
 
-#else
-
-int
-test_red(void)
-{
-       printf("The SCHED library is not included in this build\n");
-       return 0;
-}
-
+static struct test_command red_cmd = {
+       .command = "red_autotest",
+       .callback = test_red,
+};
+REGISTER_TEST_COMMAND(red_cmd);
 #endif

diff --git a/app/test/test_ring.c b/app/test/test_ring.c
index be588f26772a2e5534fe35505c944e54bda56dde..2cd8e7727b1e064909b062429a02df9756f8c17d 100644 (file)
--- a/app/test/test_ring.c
+++ b/app/test/test_ring.c
@@ -1322,7 +1322,7 @@ fail_test:
        return ret;
 }
 
-int
+static int
 test_ring(void)
 {
        /* some more basic operations */
@@ -1392,3 +1392,9 @@ test_ring(void)
 
        return 0;
 }
+
+static struct test_command ring_cmd = {
+       .command = "ring_autotest",
+       .callback = test_ring,
+};
+REGISTER_TEST_COMMAND(ring_cmd);

diff --git a/app/test/test_ring_perf.c b/app/test/test_ring_perf.c
index 9ec69329e351499a43fbd7daa661a014ee9c20ee..44dda4dbf6d182d74bfe1813d71a8da91839886e 100644 (file)
--- a/app/test/test_ring_perf.c
+++ b/app/test/test_ring_perf.c
@@ -381,7 +381,7 @@ test_bulk_enqueue_dequeue(void)
        }
 }
 
-int
+static int
 test_ring_perf(void)
 {
        struct lcore_pair cores;
@@ -413,3 +413,9 @@ test_ring_perf(void)
        }
        return 0;
 }
+
+static struct test_command ring_perf_cmd = {
+       .command = "ring_perf_autotest",
+       .callback = test_ring_perf,
+};
+REGISTER_TEST_COMMAND(ring_perf_cmd);

diff --git a/app/test/test_rwlock.c b/app/test/test_rwlock.c
index 89fc59479e58a327ae5f8d90bf7eeb8156c7cd06..c4e6e9534899a822df957561519438018cb488c5 100644 (file)
--- a/app/test/test_rwlock.c
+++ b/app/test/test_rwlock.c
@@ -97,7 +97,7 @@ test_rwlock_per_core(__attribute__((unused)) void *arg)
        return 0;
 }
 
-int
+static int
 test_rwlock(void)
 {
        int i;
@@ -129,3 +129,9 @@ test_rwlock(void)
 
        return 0;
 }
+
+static struct test_command rwlock_cmd = {
+       .command = "rwlock_autotest",
+       .callback = test_rwlock,
+};
+REGISTER_TEST_COMMAND(rwlock_cmd);

diff --git a/app/test/test_sched.c b/app/test/test_sched.c
index d9abb51b02efa0c8f8bc77a4728acecf9bbae694..2cc9df523d55d6efec8c11a41d9c1e20a5d4f721 100644 (file)
--- a/app/test/test_sched.c
+++ b/app/test/test_sched.c
@@ -155,7 +155,7 @@ prepare_pkt(struct rte_mbuf *mbuf)
 /**
  * test main entrance for library sched
  */
-int
+static int
 test_sched(void)
 {
        struct rte_mempool *mp = NULL;
@@ -229,12 +229,9 @@ test_sched(void)
        return 0;
 }
 
-#else /* RTE_LIBRTE_SCHED */
-
-int
-test_sched(void)
-{
-       printf("The Scheduler library is not included in this build\n");
-       return 0;
-}
+static struct test_command sched_cmd = {
+       .command = "sched_autotest",
+       .callback = test_sched,
+};
+REGISTER_TEST_COMMAND(sched_cmd);
 #endif /* RTE_LIBRTE_SCHED */

diff --git a/app/test/test_spinlock.c b/app/test/test_spinlock.c
index 9b45d8ed972d605889eef99446da935c8c227a31..c95b0c07a1155a936a38e4fd937a453d2829344f 100644 (file)
--- a/app/test/test_spinlock.c
+++ b/app/test/test_spinlock.c
@@ -225,7 +225,7 @@ test_spinlock_try(__attribute__((unused)) void *arg)
  * Test rte_eal_get_lcore_state() in addition to spinlocks
  * as we have "waiting" then "running" lcores.
  */
-int
+static int
 test_spinlock(void)
 {
        int ret = 0;
@@ -333,3 +333,9 @@ test_spinlock(void)
 
        return ret;
 }
+
+static struct test_command spinlock_cmd = {
+       .command = "spinlock_autotest",
+       .callback = test_spinlock,
+};
+REGISTER_TEST_COMMAND(spinlock_cmd);

diff --git a/app/test/test_string_fns.c b/app/test/test_string_fns.c
index 223797c76299560c4241ef3fc40fa2dcd9f0538c..29bfe5b8e0c145f8cef23a6e444010578946b728 100644 (file)
--- a/app/test/test_string_fns.c
+++ b/app/test/test_string_fns.c
@@ -291,7 +291,7 @@ test_rte_strsplit(void)
        return 0;
 }
 
-int
+static int
 test_string_fns(void)
 {
        if (test_rte_snprintf() < 0 ||
@@ -299,3 +299,9 @@ test_string_fns(void)
                return -1;
        return 0;
 }
+
+static struct test_command string_cmd = {
+       .command = "string_autotest",
+       .callback = test_string_fns,
+};
+REGISTER_TEST_COMMAND(string_cmd);

diff --git a/app/test/test_table.c b/app/test/test_table.c
index 970d15cdc65ecc955d715f5ad43b195ba88cd4f5..33e2efccc65801d08439b601554611ca8a9afd85 100644 (file)
--- a/app/test/test_table.c
+++ b/app/test/test_table.c
@@ -32,17 +32,7 @@
  */
 
 
-#ifndef RTE_LIBRTE_TABLE
-
-#include "test.h"
-
-int
-test_table(void)
-{
-       return 0;
-}
-
-#else
+#ifdef RTE_LIBRTE_TABLE
 
 #include <rte_byteorder.h>
 #include <rte_hexdump.h>
@@ -156,7 +146,7 @@ app_init_rings(void)
 
 }
 
-int
+static int
 test_table(void)
 {
        int status, failures;
@@ -217,4 +207,9 @@ test_table(void)
        return 0;
 }
 
+static struct test_command table_cmd = {
+       .command = "table_autotest",
+       .callback = test_table,
+};
+REGISTER_TEST_COMMAND(table_cmd);
 #endif

diff --git a/app/test/test_table.h b/app/test/test_table.h
index afea7382716077adc6c3645acf753ed0e7cb4eab..40e50dbff320cdbda166619ad96b471785cbe7f4 100644 (file)
--- a/app/test/test_table.h
+++ b/app/test/test_table.h
@@ -126,7 +126,6 @@
 } while (0)
 
 /* Function definitions */
-int test_table(void);
 uint64_t pipeline_test_hash(
        void *key,
        __attribute__((unused)) uint32_t key_size,

diff --git a/app/test/test_tailq.c b/app/test/test_tailq.c
index c9b53eee27233e10eaa0e0004efcc27d7775afe3..4d32c6f544bef4599f37322aaecf66a2d2d534e2 100644 (file)
--- a/app/test/test_tailq.c
+++ b/app/test/test_tailq.c
@@ -153,7 +153,7 @@ test_tailq_deprecated(void)
        return 0;
 }
 
-int
+static int
 test_tailq(void)
 {
        int ret = 0;
@@ -162,3 +162,9 @@ test_tailq(void)
        ret |= test_tailq_deprecated();
        return ret;
 }
+
+static struct test_command tailq_cmd = {
+       .command = "tailq_autotest",
+       .callback = test_tailq,
+};
+REGISTER_TEST_COMMAND(tailq_cmd);

diff --git a/app/test/test_timer.c b/app/test/test_timer.c
index 57b722c5f0f4d9fa7e9b83753415c58c27ad8412..ec826c0d55b9df3de26240b263228c3385e18e74 100644 (file)
--- a/app/test/test_timer.c
+++ b/app/test/test_timer.c
@@ -457,7 +457,7 @@ timer_sanity_check(void)
        return 0;
 }
 
-int
+static int
 test_timer(void)
 {
        unsigned i;
@@ -520,12 +520,9 @@ test_timer(void)
        return 0;
 }
 
-#else
-
-int
-test_timer(void)
-{
-       return 0;
-}
-
+static struct test_command timer_cmd = {
+       .command = "timer_autotest",
+       .callback = test_timer,
+};
+REGISTER_TEST_COMMAND(timer_cmd);
 #endif

diff --git a/app/test/test_timer_perf.c b/app/test/test_timer_perf.c
index 83bd45dcb4eca28e2fb1304c42f155231b988067..da924733283a21a115687495483033944ddd4b2f 100644 (file)
--- a/app/test/test_timer_perf.c
+++ b/app/test/test_timer_perf.c
@@ -62,7 +62,7 @@ timer_cb(struct rte_timer *t __rte_unused, void *param __rte_unused)
 #define do_delay() rte_pause()
 #endif
 
-int
+static int
 test_timer_perf(void)
 {
        unsigned iterations = 100;
@@ -159,12 +159,9 @@ test_timer_perf(void)
        return 0;
 }
 
-#else
-
-int
-test_timer_perf(void)
-{
-       return 0;
-}
-
+static struct test_command timer_perf_cmd = {
+       .command = "timer_perf_autotest",
+       .callback = test_timer_perf,
+};
+REGISTER_TEST_COMMAND(timer_perf_cmd);
 #endif

diff --git a/app/test/test_version.c b/app/test/test_version.c
index ac6ffa0633de70286140ee5019d7e569fb3dd76c..f66827d086f58ae8e4754a1df306531442ead3cf 100644 (file)
--- a/app/test/test_version.c
+++ b/app/test/test_version.c
@@ -41,7 +41,7 @@
 #include "test.h"
 
 
-int
+static int
 test_version(void)
 {
        const char *version = rte_version();
@@ -53,3 +53,9 @@ test_version(void)
                return -1;
        return 0;
 }
+
+static struct test_command version_cmd = {
+       .command = "version_autotest",
+       .callback = test_version,
+};
+REGISTER_TEST_COMMAND(version_cmd);