From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id CDD237F14 for ; Tue, 14 Jun 2016 12:02:01 +0200 (CEST) Received: by mail-wm0-f51.google.com with SMTP id k204so115187334wmk.0 for ; Tue, 14 Jun 2016 03:02:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uL5JUbS3hZQm5q4cxph044JCh6pNpHO02HGVtSOVvHk=; b=f1u4/NB+dP+mac3coiauqGc1EGzDinSc3RMtXHHq5sOfNzM1gAsDY5fFxpYri//dwo Ru4e0eoJHWcJCa5cH/KxL/06upKdg8VmZ+X7TlXvCqxktlI+yuDfLcjytsU5EW4Q45iI 6qdOhKCsHt1d/ofh1A7z0m0qXx7cDpNpNEERfho3ylpqwLSRw+Hpq5OotEardq6ZLAAy s481CegKyeFyFfICIiEo1F7r++AJOjmZSdbA9nmMfUxRB5So5fzz0+leNUZFiRm0AUqx zRMFzha/1hKbtE22OXJ1yIZbSu3iLjQ+RY+BZkUFbVVNP7QaSOON7+2XRKqaQtkjSVdu NXrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uL5JUbS3hZQm5q4cxph044JCh6pNpHO02HGVtSOVvHk=; b=KGP7IEGHIt6j8DXcgDYqIIwgaFRBDTAdk2tLRww2hOxJ5DT+fO5+F8Cjr7dWd33KLA iMXTHFiX6ZomTwUk3OMnl8ek6p7MJMSDmFWxUdnqFWlrU9J4oi7NCz2NIH6kfymvpI5w 3bTb8NNpH3h6qMQscHYgcsGCXQLD1ISoe9Wvtvh/Dbc8peqmWFpQnPSzubpxmzBKnbI0 c6uCqsDiAWxzDrv3zx7Vujf3FIIGJDJw+/49FlEyPQ5SA6tx3VMOVkDF2nKjGA9Ai7eI kB7n/6V5LYc0vMKKWSxQxsE4431xFTObYLkmBdcHxtdnc4xepajKenY4To9UGdODsFqJ kKrw== X-Gm-Message-State: ALyK8tJCzumCeg57TeC6LFjVRN46YKgSgFVJBlrwki3Oyh199LfT7fhH5LAxjITgYURZ08bv X-Received: by 10.194.203.105 with SMTP id kp9mr5656017wjc.70.1465898521420; Tue, 14 Jun 2016 03:02:01 -0700 (PDT) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id z1sm28678860wju.32.2016.06.14.03.02.00 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Jun 2016 03:02:00 -0700 (PDT) From: Thomas Monjalon To: Jan Viktorin Cc: dev@dpdk.org Date: Tue, 14 Jun 2016 12:01:56 +0200 Message-Id: <1465898516-16050-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1465894789-20733-1-git-send-email-thomas.monjalon@6wind.com> References: <1465894789-20733-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v2] config: make libarchive optional X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2016 10:02:02 -0000 The commit 66819e6 has introduced a dependency on libarchive to be able to use some tar resources in the unit tests. It is now an optional dependency because some systems do not have it installed. If CONFIG_RTE_APP_TEST_RESOURCE_TAR is disabled, the PCI test will not be run. When a "configure" script will be integrated, the libarchive availability could be checked to automatically enable the option. Signed-off-by: Thomas Monjalon --- v2: define empty macro linked_tar_resource if disabled --- app/test/Makefile | 12 +++++++++--- app/test/resource.c | 8 ++++++-- app/test/test_mp_secondary.c | 4 ++++ app/test/test_resource.c | 5 +++++ config/common_base | 1 + doc/guides/linux_gsg/sys_reqs.rst | 3 +++ scripts/test-build.sh | 4 ++++ 7 files changed, 32 insertions(+), 5 deletions(-) diff --git a/app/test/Makefile b/app/test/Makefile index 7e4d484..053f3a2 100644 --- a/app/test/Makefile +++ b/app/test/Makefile @@ -51,12 +51,15 @@ $(1).res.o: $(2) /dev/stdin $$@ < $$< endef +ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) define linked_tar_resource $(1).tar: $(2) tar -C $$(dir $$<) -cf $$@ $$(notdir $$<) - $(call linked_resource,$(1),$(1).tar) endef +else # ! CONFIG_RTE_APP_TEST_RESOURCE_TAR +linked_tar_resource = +endif # CONFIG_RTE_APP_TEST_RESOURCE_TAR # # library name @@ -72,7 +75,7 @@ SRCS-y += resource.c SRCS-y += test_resource.c $(eval $(call linked_resource,test_resource_c,resource.c)) $(eval $(call linked_tar_resource,test_resource_tar,test_resource.c)) -SRCS-y += test_pci.c +SRCS-$(CONFIG_RTE_APP_TEST_RESOURCE_TAR) += test_pci.c $(eval $(call linked_tar_resource,test_pci_sysfs,test_pci_sysfs)) SRCS-y += test_prefetch.c SRCS-y += test_byteorder.c @@ -194,7 +197,6 @@ CFLAGS += $(WERROR_FLAGS) CFLAGS += -D_GNU_SOURCE LDLIBS += -lm -LDLIBS += -larchive # Disable VTA for memcpy test ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) @@ -218,6 +220,10 @@ endif endif endif +ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) +LDLIBS += -larchive +endif + include $(RTE_SDK)/mk/rte.app.mk endif diff --git a/app/test/resource.c b/app/test/resource.c index 8c42eea..0e2b62c 100644 --- a/app/test/resource.c +++ b/app/test/resource.c @@ -33,8 +33,6 @@ #include #include -#include -#include #include #include @@ -97,6 +95,10 @@ int resource_fwrite_file(const struct resource *r, const char *fname) return ret; } +#ifdef RTE_APP_TEST_RESOURCE_TAR +#include +#include + static int do_copy(struct archive *r, struct archive *w) { const void *buf; @@ -295,6 +297,8 @@ fail: return -1; } +#endif /* RTE_APP_TEST_RESOURCE_TAR */ + void resource_register(struct resource *r) { TAILQ_INSERT_TAIL(&resource_list, r, next); diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c index 4dfe418..f66b68f 100644 --- a/app/test/test_mp_secondary.c +++ b/app/test/test_mp_secondary.c @@ -245,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"); @@ -252,6 +253,7 @@ run_object_creation_tests(void) return -1; } else printf("PCI scan succeeded in secondary\n"); +#endif return 0; } @@ -266,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(); } diff --git a/app/test/test_resource.c b/app/test/test_resource.c index 1e85040..39a6468 100644 --- a/app/test/test_resource.c +++ b/app/test/test_resource.c @@ -85,6 +85,7 @@ static int test_resource_c(void) return 0; } +#ifdef RTE_APP_TEST_RESOURCE_TAR REGISTER_LINKED_RESOURCE(test_resource_tar); static int test_resource_tar(void) @@ -111,6 +112,8 @@ static int test_resource_tar(void) return 0; } +#endif /* RTE_APP_TEST_RESOURCE_TAR */ + static int test_resource(void) { if (test_resource_dpdk()) @@ -119,8 +122,10 @@ static int test_resource(void) if (test_resource_c()) return -1; +#ifdef RTE_APP_TEST_RESOURCE_TAR if (test_resource_tar()) return -1; +#endif /* RTE_APP_TEST_RESOURCE_TAR */ return 0; } diff --git a/config/common_base b/config/common_base index 47c26f6..b9ba405 100644 --- a/config/common_base +++ b/config/common_base @@ -546,6 +546,7 @@ CONFIG_RTE_INSECURE_FUNCTION_WARNING=n # Compile the test application # CONFIG_RTE_APP_TEST=y +CONFIG_RTE_APP_TEST_RESOURCE_TAR=n # # Compile the PMD test application diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index 959709e..b321544 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -101,6 +101,9 @@ Compilation of the DPDK * libpcap headers and libraries (libpcap-devel) to compile and use the libpcap-based poll-mode driver. This driver is disabled by default and can be enabled by setting ``CONFIG_RTE_LIBRTE_PMD_PCAP=y`` in the build time config file. +* libarchive headers and library are needed for some unit tests using tar to get their resources. + + Running DPDK Applications ------------------------- diff --git a/scripts/test-build.sh b/scripts/test-build.sh index 48539c1..9a11f94 100755 --- a/scripts/test-build.sh +++ b/scripts/test-build.sh @@ -35,6 +35,7 @@ default_path=$PATH # Load config options: # - AESNI_MULTI_BUFFER_LIB_PATH # - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2) +# - DPDK_DEP_ARCHIVE # - DPDK_DEP_CFLAGS # - DPDK_DEP_LDFLAGS # - DPDK_DEP_MOFED (y/[n]) @@ -111,6 +112,7 @@ reset_env () { export PATH=$default_path unset CROSS + unset DPDK_DEP_ARCHIVE unset DPDK_DEP_CFLAGS unset DPDK_DEP_LDFLAGS unset DPDK_DEP_MOFED @@ -149,6 +151,8 @@ config () # sed -ri 's,(PCI_CONFIG=)n,\1y,' $1/.config sed -ri 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config sed -ri 's,(BYPASS=)n,\1y,' $1/.config + test "$DPDK_DEP_ARCHIVE" != y || \ + sed -ri 's,(RESOURCE_TAR=)n,\1y,' $1/.config test "$DPDK_DEP_MOFED" != y || \ sed -ri 's,(MLX._PMD=)n,\1y,' $1/.config test "$DPDK_DEP_SZE" != y || \ -- 2.7.0