mk: fix parallel build of test resources

[dpdk.git] / app / test / Makefile

diff --git a/app/test/Makefile b/app/test/Makefile
index 053f3a2..2de8c7a 100644 (file)
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -42,19 +42,22 @@ ifeq ($(CONFIG_RTE_APP_TEST),y)
 define linked_resource
 SRCS-y += $(1).res.o
 $(1).res.o: $(2)
-       $(OBJCOPY) -I binary -B $(RTE_OBJCOPY_ARCH) -O $(RTE_OBJCOPY_TARGET) \
+       @  echo '  MKRES $$@'
+       $Q [ "$$(<D)" = . ] || ln -fs $$<
+       $Q $(OBJCOPY) -I binary -B $(RTE_OBJCOPY_ARCH) -O $(RTE_OBJCOPY_TARGET) \
                --rename-section                                         \
                        .data=.rodata,alloc,load,data,contents,readonly  \
-               --redefine-sym _binary__dev_stdin_start=beg_$(1)         \
-               --redefine-sym _binary__dev_stdin_end=end_$(1)           \
-               --redefine-sym _binary__dev_stdin_size=siz_$(1)          \
-               /dev/stdin $$@ < $$<
+               --redefine-sym _binary_$$(subst .,_,$$(<F))_start=beg_$(1) \
+               --redefine-sym _binary_$$(subst .,_,$$(<F))_end=end_$(1)   \
+               --redefine-sym _binary_$$(subst .,_,$$(<F))_size=siz_$(1)  \
+               $$(<F) $$@
 endef
 
 ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y)
 define linked_tar_resource
 $(1).tar: $(2)
-       tar -C $$(dir $$<) -cf $$@ $$(notdir $$<)
+       @  echo '  TAR $$@'
+       $Q tar -C $$(dir $$<) -cf $$@ $$(notdir $$<)
 $(call linked_resource,$(1),$(1).tar)
 endef
 else # ! CONFIG_RTE_APP_TEST_RESOURCE_TAR
@@ -73,7 +76,9 @@ SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c
 SRCS-y += test.c
 SRCS-y += resource.c
 SRCS-y += test_resource.c
-$(eval $(call linked_resource,test_resource_c,resource.c))
+test_resource.res: test_resource.c
+       @ cp $< $@
+$(eval $(call linked_resource,test_resource_c,test_resource.res))
 $(eval $(call linked_tar_resource,test_resource_tar,test_resource.c))
 SRCS-$(CONFIG_RTE_APP_TEST_RESOURCE_TAR) += test_pci.c
 $(eval $(call linked_tar_resource,test_pci_sysfs,test_pci_sysfs))
@@ -120,6 +125,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_thash.c
 SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_perf.c
 SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_functions.c
 SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_scaling.c
+SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_multiwriter.c
 
 SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm.c
 SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm_perf.c
@@ -186,6 +192,7 @@ endif
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c
 
+SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_aes.c
 SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_perf.c
 SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c