app: fix build

PATCH In review Thomas Monjalon 2 participants 6 messages Nov 18, 2013 – Nov 21, 2013 2 messages not in the archive

lore

Share & tools

lore

Thomas Monjalon

author

2013-11-18 22:30 UTC #0 lore raw

cover app: fix build

When disabling librte_cmdline or app/test, build failed. These 3 patches fix it.

---

Thomas Monjalon (3):
app/cmdline_test: fix build without app/test
app/testpmd: fix build without librte_cmdline
app/test: fix build without librte_cmdline

 app/cmdline_test/Makefile       |    4 ++--
 app/test-pmd/Makefile           |    2 ++
 app/test-pmd/parameters.c       |   29 +++++++++++++++++++++++++++--
 app/test-pmd/testpmd.c          |    5 ++++-
 app/test/Makefile               |   16 ++++++++--------
 app/test/test.c                 |    8 +++++++-
 app/test/test.h                 |    4 ----
 app/test/test_alarm.c           |    2 --
 app/test/test_atomic.c          |    2 --
 app/test/test_byteorder.c       |    2 --
 app/test/test_cmdline.c         |    6 ++++--
 app/test/test_common.c          |    2 --
 app/test/test_cpuflags.c        |    1 -
 app/test/test_cycles.c          |    2 --
 app/test/test_debug.c           |    2 --
 app/test/test_eal_flags.c       |    2 --
 app/test/test_eal_fs.c          |    2 --
 app/test/test_errno.c           |    2 --
 app/test/test_func_reentrancy.c |    2 --
 app/test/test_hash.c            |    1 -
 app/test/test_hash_perf.c       |    1 -
 app/test/test_interrupts.c      |    2 --
 app/test/test_kni.c             |    2 --
 app/test/test_logs.c            |    2 --
 app/test/test_lpm.c             |    1 -
 app/test/test_lpm6.c            |    1 -
 app/test/test_malloc.c          |    2 --
 app/test/test_mbuf.c            |    2 --
 app/test/test_memcpy.c          |    1 -
 app/test/test_memcpy_perf.c     |    1 -
 app/test/test_memory.c          |    2 --
 app/test/test_mempool.c         |    2 --
 app/test/test_mempool_perf.c    |    2 --
 app/test/test_memzone.c         |    2 --
 app/test/test_meter.c           |    2 --
 app/test/test_mp_secondary.c    |    2 --
 app/test/test_pci.c             |    2 --
 app/test/test_per_lcore.c       |    2 --
 app/test/test_pmac_acl.c        |    2 --
 app/test/test_power.c           |    2 --
 app/test/test_prefetch.c        |    2 --
 app/test/test_red.c             |    1 -
 app/test/test_ring.c            |    2 --
 app/test/test_ring_perf.c       |    2 --
 app/test/test_rwlock.c          |    2 --
 app/test/test_sched.c           |    2 --
 app/test/test_spinlock.c        |    2 --
 app/test/test_string_fns.c      |    2 --
 app/test/test_tailq.c           |    2 --
 app/test/test_timer.c           |    2 --
 app/test/test_version.c         |    2 --
 51 files changed, 54 insertions(+), 98 deletions(-)

Signature · 1 line

1.7.10.4

A message that is not in the archive (sent off-list or not yet received): cover.1384813680.git.thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org

Thomas Monjalon

author

2013-11-18 22:31 UTC #2 lore raw

PATCH 1/3 app/cmdline_test: fix build without app/test

This application is built if LIBRTE_CMDLINE is enabled. But there was no enabled source file if APP_TEST is disabled. Let's consider that CONFIG_RTE_APP_TEST apply only on app/test.

Signed-off-by Thomas Monjalon <[email protected]>

---
 app/cmdline_test/Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

app/cmdline_test/Makefile +2 -2

index 00b398c..dab678a 100644
@@ -39,8 +39,8 @@ APP = cmdline_test
 #
 # all sources are stored in SRCS-y
 #
-SRCS-$(CONFIG_RTE_APP_TEST) += cmdline_test.c
-SRCS-$(CONFIG_RTE_APP_TEST) += commands.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += commands.c
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)

Signature · 1 line

1.7.10.4

Thomas Monjalon

author

2013-11-18 22:31 UTC #3 lore raw

PATCH 2/3 app/testpmd: fix build without librte_cmdline

In reply to a message not in the archive

Some features are not available if LIBRTE_CMDLINE is disabled:
- interactive mode
- ethernet address parsing

Note: ethernet address parsing could be rewritten without cmdline dependency.

Signed-off-by Thomas Monjalon <[email protected]>

---
 app/test-pmd/Makefile     |    2 ++
 app/test-pmd/parameters.c |   29 +++++++++++++++++++++++++++--
 app/test-pmd/testpmd.c    |    5 ++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

app/test-pmd/Makefile +2 -0

index 8f7e579..cd04ea5 100644
@@ -48,7 +48,9 @@ endif
 #
 SRCS-$(CONFIG_RTE_TEST_PMD) := testpmd.c
 SRCS-$(CONFIG_RTE_TEST_PMD) += parameters.c
+ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y)
 SRCS-$(CONFIG_RTE_TEST_PMD) += cmdline.c
+endif
 SRCS-$(CONFIG_RTE_TEST_PMD) += config.c
 SRCS-$(CONFIG_RTE_TEST_PMD) += iofwd.c
 SRCS-$(CONFIG_RTE_TEST_PMD) += macfwd.c

app/test-pmd/parameters.c +27 -2

index dbcc113..ba39ce5 100644
@@ -71,27 +71,37 @@
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
+#ifdef RTE_LIBRTE_CMDLINE
 #include <cmdline_parse.h>
 #include <cmdline_parse_etheraddr.h>
+#endif
 
 #include "testpmd.h"
 
 static void
 usage(char* progname)
 {
-	printf("usage: %s [--interactive|-i] [--help|-h] | ["
+	printf("usage: %s "
+#ifdef RTE_LIBRTE_CMDLINE
+	       "[--interactive|-i] "
+#endif
+	       "[--help|-h] | ["
 	       "--coremask=COREMASK --portmask=PORTMASK --numa "
 	       "--mbuf-size= | --total-num-mbufs= | "
 	       "--nb-cores= | --nb-ports= | "
+#ifdef RTE_LIBRTE_CMDLINE
 	       "--eth-peers-configfile= | "
 	       "--eth-peer=X,M:M:M:M:M:M | "
+#endif
 	       "--pkt-filter-mode= |"
 	       "--rss-ip | --rss-udp | "
 	       "--rxpt= | --rxht= | --rxwt= | --rxfreet= | "
 	       "--txpt= | --txht= | --txwt= | --txfreet= | "
 	       "--txrst= | --txqflags= ]\n",
 	       progname);
+#ifdef RTE_LIBRTE_CMDLINE
 	printf("  --interactive: run in interactive mode.\n");
+#endif
 	printf("  --help: display this message and quit.\n");
 	printf("  --nb-cores=N: set the number of forwarding cores "
 	       "(1 <= N <= %d).\n", nb_lcores);

@@ -118,10 +128,12 @@ usage(char* progname)
 	printf("  --total-num-mbufs=N: set the number of mbufs to be allocated "
 	       "in mbuf pools.\n");
 	printf("  --max-pkt-len=N: set the maximum size of packet to N bytes.\n");
+#ifdef RTE_LIBRTE_CMDLINE
 	printf("  --eth-peers-configfile=name: config file with ethernet addresses "
 	       "of peer ports.\n");
 	printf("  --eth-peer=X,M:M:M:M:M:M: set the MAC address of the X peer "
 	       "port (0 <= X < %d).\n", RTE_MAX_ETHPORTS);
+#endif
 	printf("  --pkt-filter-mode=N: set Flow Director mode "
 	       "(N: none (default mode) or signature or perfect).\n");
 	printf("  --pkt-filter-report-hash=N: set Flow Director report mode "

@@ -182,6 +194,7 @@ usage(char* progname)
 	       " starts forwarding\n");
 }
 
+#ifdef RTE_LIBRTE_CMDLINE
 static int
 init_peer_eth_addrs(char *config_filename)
 {

@@ -210,6 +223,7 @@ init_peer_eth_addrs(char *config_filename)
 	nb_peer_eth_addrs = (portid_t) i;
 	return 0;
 }
+#endif
 
 /*
  * Parse the coremask given as argument (hexadecimal string) and set

@@ -469,9 +483,11 @@ launch_args_parse(int argc, char** argv)
 
 	static struct option lgopts[] = {
 		{ "help",			0, 0, 0 },
+#ifdef RTE_LIBRTE_CMDLINE
 		{ "interactive",		0, 0, 0 },
 		{ "eth-peers-configfile",	1, 0, 0 },
 		{ "eth-peer",			1, 0, 0 },
+#endif
 		{ "ports",			1, 0, 0 },
 		{ "nb-cores",			1, 0, 0 },
 		{ "nb-ports",			1, 0, 0 },

@@ -521,18 +537,26 @@ launch_args_parse(int argc, char** argv)
 
 	argvopt = argv;
 
-	while ((opt = getopt_long(argc, argvopt, "ih",
+#ifdef RTE_LIBRTE_CMDLINE
+#define SHORTOPTS "ih"
+#else
+#define SHORTOPTS "h"
+#endif
+	while ((opt = getopt_long(argc, argvopt, SHORTOPTS,
 				 lgopts, &opt_idx)) != EOF) {
 		switch (opt) {
+#ifdef RTE_LIBRTE_CMDLINE
 		case 'i':
 			printf("Interactive-mode selected\n");
 			interactive = 1;
 			break;
+#endif
 		case 0: /*long options */
 			if (!strcmp(lgopts[opt_idx].name, "help")) {
 				usage(argv[0]);
 				rte_exit(EXIT_SUCCESS, "Displayed help\n");
 			}
+#ifdef RTE_LIBRTE_CMDLINE
 			if (!strcmp(lgopts[opt_idx].name, "interactive")) {
 				printf("Interactive-mode selected\n");
 				interactive = 1;

@@ -566,6 +590,7 @@ launch_args_parse(int argc, char** argv)
 						peer_addr[c];
 				nb_peer_eth_addrs++;
 			}
+#endif
 			if (!strcmp(lgopts[opt_idx].name, "nb-ports")) {
 				n = atoi(optarg);
 				if (n > 0 && n <= nb_ports)

app/test-pmd/testpmd.c +4 -1

index 6595659..f6b860f 100644
@@ -1736,9 +1736,12 @@ main(int argc, char** argv)
 	for (port_id = 0; port_id < nb_ports; port_id++)
 		rte_eth_promiscuous_enable(port_id);
 
+#ifdef RTE_LIBRTE_CMDLINE
 	if (interactive == 1)
 		prompt();
-	else {
+	else
+#endif
+	{
 		char c;
 		int rc;

Signature · 1 line

1.7.10.4

Thomas Monjalon

author

2013-11-18 22:31 UTC #4 lore raw

PATCH 3/3 app/test: fix build without librte_cmdline

In reply to a message not in the archive

Some features are not available if LIBRTE_CMDLINE is disabled:
- interactive commands
- cmdline tests
Remove also cmdline_parse includes which are not needed.

Signed-off-by Thomas Monjalon <[email protected]>

---
 app/test/Makefile               |   16 ++++++++--------
 app/test/test.c                 |    8 +++++++-
 app/test/test.h                 |    4 ----
 app/test/test_alarm.c           |    2 --
 app/test/test_atomic.c          |    2 --
 app/test/test_byteorder.c       |    2 --
 app/test/test_cmdline.c         |    6 ++++--
 app/test/test_common.c          |    2 --
 app/test/test_cpuflags.c        |    1 -
 app/test/test_cycles.c          |    2 --
 app/test/test_debug.c           |    2 --
 app/test/test_eal_flags.c       |    2 --
 app/test/test_eal_fs.c          |    2 --
 app/test/test_errno.c           |    2 --
 app/test/test_func_reentrancy.c |    2 --
 app/test/test_hash.c            |    1 -
 app/test/test_hash_perf.c       |    1 -
 app/test/test_interrupts.c      |    2 --
 app/test/test_kni.c             |    2 --
 app/test/test_logs.c            |    2 --
 app/test/test_lpm.c             |    1 -
 app/test/test_lpm6.c            |    1 -
 app/test/test_malloc.c          |    2 --
 app/test/test_mbuf.c            |    2 --
 app/test/test_memcpy.c          |    1 -
 app/test/test_memcpy_perf.c     |    1 -
 app/test/test_memory.c          |    2 --
 app/test/test_mempool.c         |    2 --
 app/test/test_mempool_perf.c    |    2 --
 app/test/test_memzone.c         |    2 --
 app/test/test_meter.c           |    2 --
 app/test/test_mp_secondary.c    |    2 --
 app/test/test_pci.c             |    2 --
 app/test/test_per_lcore.c       |    2 --
 app/test/test_pmac_acl.c        |    2 --
 app/test/test_power.c           |    2 --
 app/test/test_prefetch.c        |    2 --
 app/test/test_red.c             |    1 -
 app/test/test_ring.c            |    2 --
 app/test/test_ring_perf.c       |    2 --
 app/test/test_rwlock.c          |    2 --
 app/test/test_sched.c           |    2 --
 app/test/test_spinlock.c        |    2 --
 app/test/test_string_fns.c      |    2 --
 app/test/test_tailq.c           |    2 --
 app/test/test_timer.c           |    2 --
 app/test/test_version.c         |    2 --
 47 files changed, 19 insertions(+), 93 deletions(-)

app/test/Makefile +8 -8

index d4bfd84..a5ca98e 100644
@@ -39,7 +39,7 @@ APP = test
 #
 # all sources are stored in SRCS-y
 #
-SRCS-$(CONFIG_RTE_APP_TEST) := commands.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_pci.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_prefetch.c

@@ -78,13 +78,13 @@ SRCS-$(CONFIG_RTE_APP_TEST) += test_version.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_eal_fs.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_func_reentrancy.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_cmdline.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cmdline_num.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cmdline_etheraddr.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cmdline_portlist.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cmdline_ipaddr.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cmdline_cirbuf.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cmdline_string.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cmdline_lib.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_num.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_etheraddr.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_portlist.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_ipaddr.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_cirbuf.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_string.c
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_lib.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_red.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_sched.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_meter.c

app/test/test.c +7 -1

index 606fc55..73039b2 100644
@@ -41,10 +41,13 @@
 #include <ctype.h>
 #include <sys/queue.h>
 
+#ifdef RTE_LIBRTE_CMDLINE
 #include <cmdline_rdline.h>
 #include <cmdline_parse.h>
 #include <cmdline_socket.h>
 #include <cmdline.h>
+extern cmdline_parse_ctx_t main_ctx[];
+#endif
 
 #include <rte_memory.h>
 #include <rte_memzone.h>

@@ -102,7 +105,9 @@ do_recursive_call(void)
 int
 main(int argc, char **argv)
 {
+#ifdef RTE_LIBRTE_CMDLINE
 	struct cmdline *cl;
+#endif
 	int ret;
 
 	ret = rte_eal_init(argc, argv);

@@ -127,13 +132,14 @@ main(int argc, char **argv)
 				"HPET is not enabled, using TSC as default timer\n");
 
 
-
+#ifdef RTE_LIBRTE_CMDLINE
 	cl = cmdline_stdin_new(main_ctx, "RTE>>");
 	if (cl == NULL) {
 		return -1;
 	}
 	cmdline_interact(cl);
 	cmdline_stdin_exit(cl);
+#endif
 
 	return 0;
 }

app/test/test.h +0 -4

index 1ce0c31..524e8e4 100644
@@ -43,10 +43,6 @@
 
 extern const char *prgname;
 
-#include <cmdline_parse.h>
-
-extern cmdline_parse_ctx_t main_ctx[];
-
 int main(int argc, char **argv);
 
 int test_pci(void);

app/test/test_alarm.c +0 -2

index 0cfe36b..3dd1d96 100644
@@ -34,8 +34,6 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_interrupts.h>

app/test/test_atomic.c +0 -2

index e479cb7..c0bbb36 100644
@@ -36,8 +36,6 @@
 #include <unistd.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_per_lcore.h>

app/test/test_byteorder.c +0 -2

index 2a6ab96..025de8d 100644
@@ -36,8 +36,6 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_byteorder.h>
 
 #include "test.h"

app/test/test_cmdline.c +4 -2

index d6de637..4d85a02 100644
@@ -33,14 +33,13 @@
 
 #include <stdio.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 #include "test_cmdline.h"
 
 int
 test_cmdline(void)
 {
+#ifdef CONFIG_RTE_LIBRTE_CMDLINE
 	printf("Testind parsing ethernet addresses...\n");
 	if (test_parse_etheraddr_valid() < 0)
 		return -1;

@@ -88,6 +87,9 @@ 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;
 }

app/test/test_common.c +0 -2

index 1252fdd..071e29d 100644
@@ -36,8 +36,6 @@
 #include <rte_common.h>
 #include <rte_hexdump.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #define MAX_NUM 1 << 20

app/test/test_cpuflags.c +0 -1

index c2eaaf0..b5bbeeb 100644
@@ -33,7 +33,6 @@
 
 #include <stdio.h>
 
-#include <cmdline_parse.h>
 #include <errno.h>
 #include <stdint.h>
 #include <rte_cpuflags.h>

app/test/test_cycles.c +0 -2

index 187b54e..b1a183f 100644
@@ -34,8 +34,6 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_cycles.h>

app/test/test_debug.c +0 -2

index 0ebb7ab..b731806 100644
@@ -36,8 +36,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_debug.h>
 #include <rte_common.h>
 #include <rte_eal.h>

app/test/test_eal_flags.c +0 -2

index 8f33aa5..c70bcfa 100644
@@ -32,8 +32,6 @@
  */
 #include <stdio.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #ifndef RTE_EXEC_ENV_BAREMETAL

app/test/test_eal_fs.c +0 -2

index fb60351..c8805ac 100644
@@ -31,8 +31,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 #ifndef RTE_EXEC_ENV_BAREMETAL
 #include <stdio.h>

app/test/test_errno.c +0 -2

index 5cb2e15..36df047 100644
@@ -40,8 +40,6 @@
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 int

app/test/test_func_reentrancy.c +0 -2

index 15d4dae..8400ff0 100644
@@ -70,8 +70,6 @@
 
 #include <rte_string_fns.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 typedef int (*case_func_t)(void* arg);

app/test/test_hash.c +0 -1

index bf8bdfb..1d562af 100644
@@ -49,7 +49,6 @@
 #include <rte_eal.h>
 #include <rte_ip.h>
 #include <rte_string_fns.h>
-#include <cmdline_parse.h>
 
 #include "test.h"

app/test/test_hash_perf.c +0 -1

index 0f7d421..fd8eee6 100644
@@ -50,7 +50,6 @@
 #include <rte_eal.h>
 #include <rte_ip.h>
 #include <rte_string_fns.h>
-#include <cmdline_parse.h>
 
 #include "test.h"

app/test/test_interrupts.c +0 -2

index 31f3d26..0d5085c 100644
@@ -35,8 +35,6 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_interrupts.h>

app/test/test_kni.c +0 -2

index 5ed5045..5f48fad 100644
@@ -37,8 +37,6 @@
 #include <string.h>
 #include <sys/wait.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #ifdef RTE_LIBRTE_KNI

app/test/test_logs.c +0 -2

index 379579d..ed8ac0f 100644
@@ -36,8 +36,6 @@
 #include <stdarg.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>

app/test/test_lpm.c +0 -1

index a62e981..30b04ec 100644
@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/queue.h>
-#include <cmdline_parse.h>
 
 #include <rte_common.h>
 #include <rte_cycles.h>

app/test/test_lpm6.c +0 -1

index 8e21e75..dd8cee9 100644
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/queue.h>
-#include <cmdline_parse.h>
 
 #include <time.h>

app/test/test_malloc.c +0 -2

index 98fe02a..59696b1 100644
@@ -39,8 +39,6 @@
 #include <stdlib.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>

app/test/test_mbuf.c +0 -2

index 936814c..4ce1713 100644
@@ -60,8 +60,6 @@
 #include <rte_random.h>
 #include <rte_cycles.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #define MBUF_SIZE               2048

app/test/test_memcpy.c +0 -1

index b458ad9..275db4d 100644
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 
 #include <rte_common.h>
-#include <cmdline_parse.h>
 #include <rte_cycles.h>
 #include <rte_random.h>
 #include <rte_malloc.h>

app/test/test_memcpy_perf.c +0 -1

index 1aa9f0a..f236ad2 100644
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 
 #include <rte_common.h>
-#include <cmdline_parse.h>
 #include <rte_cycles.h>
 #include <rte_random.h>
 #include <rte_malloc.h>

app/test/test_memory.c +0 -2

index 30e59cd..ffd6ef9 100644
@@ -34,8 +34,6 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_memory.h>
 #include <rte_common.h>

app/test/test_mempool.c +0 -2

index da8dc5c..ac378f3 100644
@@ -58,8 +58,6 @@
 #include <rte_spinlock.h>
 #include <rte_malloc.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 /*

app/test/test_mempool_perf.c +0 -2

index 96b47cc..f0704de 100644
@@ -58,8 +58,6 @@
 #include <rte_spinlock.h>
 #include <rte_malloc.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 /*

app/test/test_memzone.c +0 -2

index 294c0db..ce04340 100644
@@ -36,8 +36,6 @@
 #include <inttypes.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_random.h>
 #include <rte_cycles.h>
 #include <rte_memory.h>

app/test/test_meter.c +0 -2

index 688978d..bbdf4e0 100644
@@ -37,8 +37,6 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #ifdef RTE_LIBRTE_METER

app/test/test_mp_secondary.c +0 -2

index 19af32c..b1365fc 100644
@@ -33,8 +33,6 @@
 
 #include <stdio.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #ifndef RTE_EXEC_ENV_BAREMETAL

app/test/test_pci.c +0 -2

index 7cbbfdd..af1a7b3 100644
@@ -36,8 +36,6 @@
 #include <stdint.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_interrupts.h>
 #include <rte_pci.h>

app/test/test_per_lcore.c +0 -2

index 2bd56a1..a9e4a21 100644
@@ -35,8 +35,6 @@
 #include <stdint.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>

app/test/test_pmac_acl.c +0 -2

index cc2df09..358e01c 100644
@@ -34,8 +34,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_string_fns.h>
 #include <rte_mbuf.h>

app/test/test_power.c +0 -2

index 1d0169a..b11a562 100644
@@ -37,8 +37,6 @@
 #include <limits.h>
 #include <string.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #ifdef RTE_LIBRTE_POWER

app/test/test_prefetch.c +0 -2

index b10ac7b..813b9a1 100644
@@ -34,8 +34,6 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_prefetch.h>
 
 #include "test.h"

app/test/test_red.c +0 -1

index 526bfb4..3300e69 100644
@@ -40,7 +40,6 @@
 #include <sys/time.h>
 #include <time.h>
 #include <math.h>
-#include <cmdline_parse.h>
 
 #include "test.h"

app/test/test_ring.c +0 -2

index fc50add..a96c3bf 100644
@@ -59,8 +59,6 @@
 #include <rte_errno.h>
 #include <rte_hexdump.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 /*

app/test/test_ring_perf.c +0 -2

index 5c369e9..e35ee88 100644
@@ -38,8 +38,6 @@
 #include <rte_cycles.h>
 #include <rte_launch.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 /*

app/test/test_rwlock.c +0 -2

index 48b0c59..dd041a7 100644
@@ -36,8 +36,6 @@
 #include <unistd.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>

app/test/test_sched.c +0 -2

index e87a1ca..99da8ed 100644
@@ -37,8 +37,6 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #if defined(RTE_LIBRTE_SCHED) && defined(RTE_ARCH_X86_64)

app/test/test_spinlock.c +0 -2

index 829be8d..c623993 100644
@@ -38,8 +38,6 @@
 #include <unistd.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>

app/test/test_string_fns.c +0 -2

index 258ae75..e4389a7 100644
@@ -39,8 +39,6 @@
 
 #include <rte_string_fns.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #define LOG(...) do {\

app/test/test_tailq.c +0 -2

index 1cc4c29..c434be7 100644
@@ -37,8 +37,6 @@
 #include <errno.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_string_fns.h>

app/test/test_timer.c +0 -2

index 026b576..28861fa 100644
@@ -121,8 +121,6 @@
 #include <sys/queue.h>
 #include <math.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_memory.h>

app/test/test_version.c +0 -2

index d078dae..abf5b91 100644
@@ -35,8 +35,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_common.h>
 #include <rte_version.h>

Signature · 1 line

1.7.10.4

Olivier MATZ

2013-11-21 14:26 UTC #5 lore raw

In reply to a message not in the archive

Hi Thomas,

Quoted 2 lines · Thomas Monjalon

When disabling librte_cmdline or app/test, build failed. These 3 patches fix it.

Acked (all 3 patches)

A message that is not in the archive (sent off-list or not yet received): [email protected]

Thomas Monjalon

author

2013-11-21 21:09 UTC #7 lore raw

21/11/2013 15:26, Olivier MATZ :

Quoted 5 lines · Thomas Monjalon

Quoted 2 lines
When disabling librte_cmdline or app/test, build failed. These 3 patches fix it.
Acked (all 3 patches)

Pushed

Signature · 1 line

Thomas