-SRCS-$(CONFIG_RTE_APP_TEST) += test.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_pci.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_prefetch.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_byteorder.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_per_lcore.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_atomic.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_malloc.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cycles.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_spinlock.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_memory.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_memzone.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_ring.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_ring_perf.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_rwlock.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_timer.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_mempool.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_mempool_perf.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_mbuf.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_logs.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_memcpy.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_memcpy_perf.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_hash.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_hash_perf.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_lpm.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_lpm6.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_debug.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_errno.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_tailq.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_string_fns.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_mp_secondary.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_cpuflags.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_eal_flags.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_alarm.c
-SRCS-$(CONFIG_RTE_APP_TEST) += test_interrupts.c
-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-y += test.c
+SRCS-y += resource.c
+SRCS-y += test_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_cfgfile.c
+$(eval $(call linked_tar_resource,test_cfgfiles,test_cfgfiles))
+SRCS-y += test_prefetch.c
+SRCS-y += test_byteorder.c
+SRCS-y += test_per_lcore.c
+SRCS-y += test_atomic.c
+SRCS-y += test_barrier.c
+SRCS-y += test_malloc.c
+SRCS-y += test_cycles.c
+SRCS-y += test_mcslock.c
+SRCS-y += test_spinlock.c
+SRCS-y += test_ticketlock.c
+SRCS-y += test_memory.c
+SRCS-y += test_memzone.c
+SRCS-y += test_bitmap.c
+SRCS-y += test_reciprocal_division.c
+SRCS-y += test_reciprocal_division_perf.c
+SRCS-y += test_fbarray.c
+SRCS-y += test_external_mem.c
+SRCS-y += test_rand_perf.c
+
+SRCS-y += test_ring.c
+SRCS-y += test_ring_mpmc_stress.c
+SRCS-y += test_ring_hts_stress.c
+SRCS-y += test_ring_perf.c
+SRCS-y += test_ring_peek_stress.c
+SRCS-y += test_ring_rts_stress.c
+SRCS-y += test_ring_stress.c
+SRCS-y += test_pmd_perf.c
+
+ifeq ($(CONFIG_RTE_LIBRTE_TABLE),y)
+SRCS-y += test_table.c
+SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test_table_pipeline.c
+SRCS-y += test_table_tables.c
+SRCS-y += test_table_ports.c
+SRCS-y += test_table_combined.c
+SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_table_acl.c
+SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += test_flow_classify.c
+endif
+
+SRCS-y += test_rwlock.c
+
+SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack.c
+SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack_perf.c
+
+SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer.c
+SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_perf.c
+SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_racecond.c
+SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_secondary.c
+
+SRCS-y += test_mempool.c
+SRCS-y += test_mempool_perf.c
+
+SRCS-y += test_mbuf.c
+SRCS-y += test_logs.c
+
+SRCS-y += test_memcpy.c
+SRCS-y += test_memcpy_perf.c
+
+
+SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member.c
+SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member_perf.c
+
+SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd.c
+SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd_perf.c
+
+SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash.c
+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_multiwriter.c
+SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite.c
+SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite_lf_perf.c
+
+SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib.c
+SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib6.c
+SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib.c
+SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6.c
+SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib_perf.c
+SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6_perf.c
+
+SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm.c
+SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm_perf.c
+SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6.c
+SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6_perf.c
+
+SRCS-y += test_debug.c
+SRCS-y += test_errno.c
+SRCS-y += test_tailq.c
+SRCS-y += test_string_fns.c
+SRCS-y += test_cpuflags.c
+SRCS-y += test_mp_secondary.c
+SRCS-y += test_eal_flags.c
+SRCS-y += test_eal_fs.c
+SRCS-y += test_alarm.c
+SRCS-y += test_interrupts.c
+SRCS-y += test_version.c
+SRCS-y += test_func_reentrancy.c
+SRCS-y += test_trace.c
+SRCS-y += test_trace_register.c
+SRCS-y += test_trace_perf.c
+SRCS-y += test_service_cores.c
+
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
+SRCS-y += sample_packet_forward.c
+SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
+SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c
+SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c
+endif
+
+SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline.c