build: remove special handling for node library

[dpdk.git] / app / test / meson.build

diff --git a/app/test/meson.build b/app/test/meson.build
index 279457f..56591db 100644 (file)
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -12,6 +12,7 @@ test_sources = files('commands.c',
        'test_alarm.c',
        'test_atomic.c',
        'test_barrier.c',
+       'test_bitops.c',
        'test_bpf.c',
        'test_byteorder.c',
        'test_cmdline.c',
@@ -63,10 +64,9 @@ test_sources = files('commands.c',
         'test_ipfrag.c',
        'test_ipsec.c',
        'test_ipsec_sad.c',
+       'test_ipsec_perf.c',
        'test_kni.c',
        'test_kvargs.c',
-       'test_link_bonding.c',
-       'test_link_bonding_rssconf.c',
        'test_logs.c',
        'test_lpm.c',
        'test_lpm6.c',
@@ -105,9 +105,10 @@ test_sources = files('commands.c',
        'test_ring.c',
        'test_ring_mpmc_stress.c',
        'test_ring_hts_stress.c',
-       'test_ring_peek_stress.c',
+       'test_ring_mt_peek_stress.c',
        'test_ring_perf.c',
        'test_ring_rts_stress.c',
+       'test_ring_st_peek_stress.c',
        'test_ring_stress.c',
        'test_rwlock.c',
        'test_sched.c',
@@ -138,6 +139,8 @@ test_sources = files('commands.c',
 )
 
 test_deps = ['acl',
+       'bus_pci',
+       'bus_vdev',
        'bitratestats',
        'bpf',
        'cfgfile',
@@ -175,6 +178,7 @@ fast_tests = [
         ['acl_autotest', true],
         ['alarm_autotest', false],
         ['atomic_autotest', false],
+        ['bitops_autotest', true],
         ['byteorder_autotest', true],
         ['cmdline_autotest', true],
         ['common_autotest', true],
@@ -291,6 +295,7 @@ perf_test_names = [
         'hash_readwrite_perf_autotest',
         'hash_readwrite_lf_perf_autotest',
         'trace_perf_autotest',
+       'ipsec_perf_autotest',
 ]
 
 driver_test_names = [
@@ -310,8 +315,6 @@ driver_test_names = [
         'cryptodev_sw_zuc_autotest',
         'eventdev_selftest_octeontx',
         'eventdev_selftest_sw',
-        'link_bonding_autotest',
-        'link_bonding_rssconf_autotest',
         'rawdev_autotest',
 ]
 
@@ -348,6 +351,12 @@ endif
 # they are used via a driver-specific API.
 if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
        test_deps += 'pmd_bond'
+       test_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c']
+       driver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest']
+       if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
+               test_sources += 'test_link_bonding_mode4.c'
+               driver_test_names += 'link_bonding_mode4_autotest'
+       endif
 endif
 if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
        test_deps += 'pmd_ring'
@@ -356,7 +365,6 @@ if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
        test_sources += 'test_event_eth_tx_adapter.c'
        test_sources += 'test_bitratestats.c'
        test_sources += 'test_latencystats.c'
-       test_sources += 'test_link_bonding_mode4.c'
        test_sources += 'sample_packet_forward.c'
        test_sources += 'test_pdump.c'
        fast_tests += [['ring_pmd_autotest', true]]
@@ -364,7 +372,6 @@ if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
        fast_tests += [['event_eth_tx_adapter_autotest', false]]
        fast_tests += [['bitratestats_autotest', true]]
        fast_tests += [['latencystats_autotest', true]]
-       driver_test_names += 'link_bonding_mode4_autotest'
        fast_tests += [['pdump_autotest', true]]
 endif
 
@@ -409,15 +416,13 @@ endforeach
 test_dep_objs += cc.find_library('execinfo', required: false)
 
 link_libs = []
-link_nodes = []
 if get_option('default_library') == 'static'
-       link_libs = dpdk_drivers
-       link_nodes = dpdk_graph_nodes
+       link_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
 dpdk_test = executable('dpdk-test',
        test_sources,
-       link_whole: link_libs + link_nodes,
+       link_whole: link_libs,
        dependencies: test_dep_objs,
        c_args: cflags,
        install_rpath: driver_install_path,