diff options
| -rw-r--r-- | test/Makefile.inc | 1 | ||||
| -rw-r--r-- | test/common/Makefile.am | 7 | ||||
| -rw-r--r-- | test/common/bench_common.c (renamed from test/performance/bench_common.c) | 0 | ||||
| -rw-r--r-- | test/common/bench_common.h (renamed from test/performance/bench_common.h) | 0 | ||||
| -rw-r--r-- | test/performance/Makefile.am | 12 | ||||
| -rw-r--r-- | test/performance/odp_bench_buffer.c | 2 | ||||
| -rw-r--r-- | test/performance/odp_bench_misc.c | 2 | ||||
| -rw-r--r-- | test/performance/odp_bench_packet.c | 2 | ||||
| -rw-r--r-- | test/performance/odp_bench_pktio_sp.c | 2 | ||||
| -rw-r--r-- | test/performance/odp_bench_timer.c | 2 |
10 files changed, 19 insertions, 11 deletions
diff --git a/test/Makefile.inc b/test/Makefile.inc index cc6a33df5..c3c43e26e 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -4,6 +4,7 @@ COMMON_DIR = $(top_builddir)/test/common LIBODP = $(LIB)/libodphelper.la $(LIB)/lib$(ODP_LIB_NAME).la +LIBBENCH_COMMON = $(COMMON_DIR)/libbench_common.la LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la LIBPACKET_COMMON = $(COMMON_DIR)/libpacket_common.la diff --git a/test/common/Makefile.am b/test/common/Makefile.am index 72658df73..f1be3819e 100644 --- a/test/common/Makefile.am +++ b/test/common/Makefile.am @@ -1,8 +1,13 @@ include $(top_srcdir)/test/Makefile.inc +noinst_LTLIBRARIES = \ + libbench_common.la + +libbench_common_la_SOURCES = bench_common.c bench_common.h + if cunit_support -noinst_LTLIBRARIES = \ +noinst_LTLIBRARIES += \ libcunit_common.la \ libcpumask_common.la \ libpacket_common.la \ diff --git a/test/performance/bench_common.c b/test/common/bench_common.c index 640889503..640889503 100644 --- a/test/performance/bench_common.c +++ b/test/common/bench_common.c diff --git a/test/performance/bench_common.h b/test/common/bench_common.h index 4b59c941f..4b59c941f 100644 --- a/test/performance/bench_common.h +++ b/test/common/bench_common.h diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 8142d5db9..ae565b109 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -63,11 +63,11 @@ endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) odp_atomic_perf_SOURCES = odp_atomic_perf.c -odp_bench_buffer_SOURCES = odp_bench_buffer.c bench_common.c bench_common.h -odp_bench_misc_SOURCES = odp_bench_misc.c bench_common.c bench_common.h -odp_bench_packet_SOURCES = odp_bench_packet.c bench_common.c bench_common.h -odp_bench_pktio_sp_SOURCES = odp_bench_pktio_sp.c bench_common.c bench_common.h -odp_bench_timer_SOURCES = odp_bench_timer.c bench_common.c bench_common.h +odp_bench_buffer_SOURCES = odp_bench_buffer.c +odp_bench_misc_SOURCES = odp_bench_misc.c +odp_bench_packet_SOURCES = odp_bench_packet.c +odp_bench_pktio_sp_SOURCES = odp_bench_pktio_sp.c +odp_bench_timer_SOURCES = odp_bench_timer.c odp_cpu_bench_SOURCES = odp_cpu_bench.c odp_crc_SOURCES = odp_crc.c odp_crypto_SOURCES = odp_crypto.c @@ -95,6 +95,8 @@ odp_ipsecfwd_SOURCES = odp_ipsecfwd.c AM_CFLAGS += $(LIBCONFIG_CFLAGS) endif +PRELDADD += $(LIBBENCH_COMMON) + dist_check_SCRIPTS = $(TESTSCRIPTS) dist_check_DATA = udp64.pcap diff --git a/test/performance/odp_bench_buffer.c b/test/performance/odp_bench_buffer.c index 838617f78..708a989f9 100644 --- a/test/performance/odp_bench_buffer.c +++ b/test/performance/odp_bench_buffer.c @@ -14,7 +14,7 @@ #include <odp_api.h> #include <odp/helper/odph_api.h> -#include "bench_common.h" +#include <bench_common.h> #include <getopt.h> #include <inttypes.h> diff --git a/test/performance/odp_bench_misc.c b/test/performance/odp_bench_misc.c index a0e9476e6..402ffecd2 100644 --- a/test/performance/odp_bench_misc.c +++ b/test/performance/odp_bench_misc.c @@ -17,7 +17,7 @@ #include <odp_api.h> #include <odp/helper/odph_api.h> -#include "bench_common.h" +#include <bench_common.h> #include <getopt.h> #include <inttypes.h> diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index 487f9a7b4..d8eaac79e 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -24,7 +24,7 @@ #include <odp_api.h> #include <odp/helper/odph_api.h> -#include "bench_common.h" +#include <bench_common.h> /** Packet user area size in bytes */ #define PKT_POOL_UAREA_SIZE 8 diff --git a/test/performance/odp_bench_pktio_sp.c b/test/performance/odp_bench_pktio_sp.c index 179db129d..d19b7139c 100644 --- a/test/performance/odp_bench_pktio_sp.c +++ b/test/performance/odp_bench_pktio_sp.c @@ -17,7 +17,7 @@ #include <odp_api.h> #include <odp/helper/odph_api.h> -#include "bench_common.h" +#include <bench_common.h> #include <getopt.h> #include <inttypes.h> diff --git a/test/performance/odp_bench_timer.c b/test/performance/odp_bench_timer.c index ad80367d1..b25fc1d49 100644 --- a/test/performance/odp_bench_timer.c +++ b/test/performance/odp_bench_timer.c @@ -17,7 +17,7 @@ #include <odp_api.h> #include <odp/helper/odph_api.h> -#include "bench_common.h" +#include <bench_common.h> #include <getopt.h> #include <inttypes.h> |