summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-03-06 16:22:39 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-03-12 17:31:22 +0100
commit742bde12f3bd008c2f06d744330436d8b1a56720 (patch)
treeaf30fda2aa2cda1fb00e6b0740ba11f1e4ce6469 /app
parent91d7846ce68d7c637cd7efde751f5276475aa9c8 (diff)
downloaddpdk-next-eventdev-742bde12f3bd008c2f06d744330436d8b1a56720.zip
dpdk-next-eventdev-742bde12f3bd008c2f06d744330436d8b1a56720.tar.gz
dpdk-next-eventdev-742bde12f3bd008c2f06d744330436d8b1a56720.tar.xz
build/linux: rename macro from LINUXAPP to LINUX
Rename the macro to make things shorter and more comprehensible. For both meson and make builds, keep the old macro around for backward compatibility. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Diffstat (limited to 'app')
-rw-r--r--app/test/process.h2
-rw-r--r--app/test/test_eal_flags.c2
-rw-r--r--app/test/test_interrupts.c4
-rw-r--r--app/test/test_kni.c2
-rw-r--r--app/test/test_mp_secondary.c6
-rw-r--r--app/test/test_pdump.c2
-rw-r--r--app/test/test_timer_perf.c2
-rw-r--r--app/test/test_timer_racecond.c2
8 files changed, 11 insertions, 11 deletions
diff --git a/app/test/process.h b/app/test/process.h
index 7f62f64..998d653 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -82,7 +82,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
/* FreeBSD doesn't support file prefixes, so force compile failures for any
* tests attempting to use this function on FreeBSD.
*/
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
static char *
get_current_prefix(char *prefix, int size)
{
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 81e345b..e286410 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -190,7 +190,7 @@ end:
return result;
}
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
/*
* count the number of "node*" files in /sys/devices/system/node/
*/
diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c
index 4e82e9a..d8c2d81 100644
--- a/app/test/test_interrupts.c
+++ b/app/test/test_interrupts.c
@@ -31,7 +31,7 @@ static struct rte_intr_handle intr_handles[TEST_INTERRUPT_HANDLE_MAX];
static enum test_interrupt_handle_type test_intr_type =
TEST_INTERRUPT_HANDLE_MAX;
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
union intr_pipefds{
struct {
int pipefd[2];
@@ -169,7 +169,7 @@ test_interrupt_handle_compare(struct rte_intr_handle *intr_handle_l,
return 0;
}
-#endif /* RTE_EXEC_ENV_LINUXAPP */
+#endif /* RTE_EXEC_ENV_LINUX */
/**
* Callback for the test interrupt.
diff --git a/app/test/test_kni.c b/app/test/test_kni.c
index c92c090..7a65de1 100644
--- a/app/test/test_kni.c
+++ b/app/test/test_kni.c
@@ -11,7 +11,7 @@
#include "test.h"
-#if !defined(RTE_EXEC_ENV_LINUXAPP) || !defined(RTE_LIBRTE_KNI)
+#if !defined(RTE_EXEC_ENV_LINUX) || !defined(RTE_LIBRTE_KNI)
static int
test_kni(void)
diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c
index b597dfc..2ac33f7 100644
--- a/app/test/test_mp_secondary.c
+++ b/app/test/test_mp_secondary.c
@@ -60,7 +60,7 @@ run_secondary_instances(void)
int ret = 0;
char coremask[10];
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
char tmp[PATH_MAX] = {0};
char prefix[PATH_MAX] = {0};
@@ -86,7 +86,7 @@ run_secondary_instances(void)
prgname, "-c", coremask, "--proc-type=ERROR",
prefix
};
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
/* bad case, using invalid file prefix */
const char *argv4[] = {
prgname, "-c", coremask, "--proc-type=secondary",
@@ -101,7 +101,7 @@ run_secondary_instances(void)
ret |= launch_proc(argv2);
ret |= !(launch_proc(argv3));
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
ret |= !(launch_proc(argv4));
#endif
diff --git a/app/test/test_pdump.c b/app/test/test_pdump.c
index 4a894c0..af20696 100644
--- a/app/test/test_pdump.c
+++ b/app/test/test_pdump.c
@@ -172,7 +172,7 @@ run_pdump_server_tests(void)
int ret = 0;
char coremask[10];
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
char tmp[PATH_MAX] = { 0 };
char prefix[PATH_MAX] = { 0 };
diff --git a/app/test/test_timer_perf.c b/app/test/test_timer_perf.c
index 0fe2b74..0ede4b3 100644
--- a/app/test/test_timer_perf.c
+++ b/app/test/test_timer_perf.c
@@ -27,7 +27,7 @@ timer_cb(struct rte_timer *t __rte_unused, void *param __rte_unused)
#define DELAY_SECONDS 1
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
#define do_delay() usleep(10)
#else
#define do_delay() rte_pause()
diff --git a/app/test/test_timer_racecond.c b/app/test/test_timer_racecond.c
index d29048e..1edb444 100644
--- a/app/test/test_timer_racecond.c
+++ b/app/test/test_timer_racecond.c
@@ -46,7 +46,7 @@
#undef TEST_TIMER_RACECOND_VERBOSE
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
#define usec_delay(us) usleep(us)
#else
#define usec_delay(us) rte_delay_us(us)