tile: fix build

[dpdk.git] / app / test / test_mp_secondary.c

diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c
index 5ec99a2..26c4afd 100644 (file)
--- a/app/test/test_mp_secondary.c
+++ b/app/test/test_mp_secondary.c
@@ -35,7 +35,6 @@
 
 #include "test.h"
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -56,7 +55,6 @@
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_launch.h>
 #include <rte_per_lcore.h>
@@ -85,6 +83,7 @@
 #define launch_proc(ARGV) process_dup(ARGV, \
                sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
 
+#ifdef RTE_EXEC_ENV_LINUXAPP
 static char*
 get_current_prefix(char * prefix, int size)
 {
@@ -92,22 +91,23 @@ get_current_prefix(char * prefix, int size)
        char buf[PATH_MAX] = {0};
 
        /* get file for config (fd is always 3) */
-       rte_snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
+       snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
 
        /* return NULL on error */
        if (readlink(path, buf, sizeof(buf)) == -1)
                return NULL;
 
        /* get the basename */
-       rte_snprintf(buf, sizeof(buf), "%s", basename(buf));
+       snprintf(buf, sizeof(buf), "%s", basename(buf));
 
        /* copy string all the way from second char up to start of _config */
-       rte_snprintf(prefix, size, "%.*s",
+       snprintf(prefix, size, "%.*s",
                        (int)(strnlen(buf, sizeof(buf)) - sizeof("_config")),
                        &buf[1]);
 
        return prefix;
 }
+#endif
 
 /*
  * This function is called in the primary i.e. main test, to spawn off secondary
@@ -119,12 +119,16 @@ run_secondary_instances(void)
        int ret = 0;
        char coremask[10];
 
+#ifdef RTE_EXEC_ENV_LINUXAPP
        char tmp[PATH_MAX] = {0};
        char prefix[PATH_MAX] = {0};
 
        get_current_prefix(tmp, sizeof(tmp));
 
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#else
+       const char *prefix = "";
+#endif
 
        /* good case, using secondary */
        const char *argv1[] = {
@@ -141,20 +145,24 @@ run_secondary_instances(void)
                        prgname, "-c", coremask, "--proc-type=ERROR",
                        prefix
        };
+#ifdef RTE_EXEC_ENV_LINUXAPP
        /* bad case, using invalid file prefix */
        const char *argv4[]  = {
                        prgname, "-c", coremask, "--proc-type=secondary",
                                        "--file-prefix=ERROR"
        };
+#endif
 
-       rte_snprintf(coremask, sizeof(coremask), "%x", \
+       snprintf(coremask, sizeof(coremask), "%x", \
                        (1 << rte_get_master_lcore()));
 
        ret |= launch_proc(argv1);
        ret |= launch_proc(argv2);
 
        ret |= !(launch_proc(argv3));
+#ifdef RTE_EXEC_ENV_LINUXAPP
        ret |= !(launch_proc(argv4));
+#endif
 
        return ret;
 }
@@ -224,7 +232,12 @@ run_object_creation_tests(void)
 
 #ifdef RTE_LIBRTE_LPM
        rte_errno=0;
-       if ((rte_lpm_create("test_lpm", size, rte_socket_id(), 0) != NULL) &&
+       struct rte_lpm_config config;
+
+       config.max_rules = rte_socket_id();
+       config.number_tbl8s = 256;
+       config.flags = 0;
+       if ((rte_lpm_create("test_lpm", size, &config) != NULL) &&
            (rte_lpm_find_existing("test_lpm") == NULL)){
                printf("Error: unexpected return value from rte_lpm_create()\n");
                return -1;
@@ -232,6 +245,7 @@ run_object_creation_tests(void)
        printf("# Checked rte_lpm_create() OK\n");
 #endif
 
+#ifdef RTE_APP_TEST_RESOURCE_TAR
        /* Run a test_pci call */
        if (test_pci() != 0) {
                printf("PCI scan failed in secondary\n");
@@ -239,6 +253,7 @@ run_object_creation_tests(void)
                        return -1;
        } else
                printf("PCI scan succeeded in secondary\n");
+#endif
 
        return 0;
 }
@@ -253,9 +268,11 @@ test_mp_secondary(void)
 {
        if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
                if (!test_pci_run) {
+#ifdef RTE_APP_TEST_RESOURCE_TAR
                        printf("=== Running pre-requisite test of test_pci\n");
                        test_pci();
                        printf("=== Requisite test done\n");
+#endif
                }
                return run_secondary_instances();
        }
@@ -265,16 +282,4 @@ 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;
-}
-
-#endif
+REGISTER_TEST_COMMAND(multiprocess_autotest, test_mp_secondary);