This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via d6e2cd7830bd474e78980414ad7046443a4a3720 (commit) via e114fba150e07e7f25b86306c30003416324955e (commit) via 316d020fc2e3fee86b955eec4946290d90fb2eb1 (commit) via 4c8e7df6337e79cef937ad3246d61e75b7d2164d (commit) via 01f75d6582aadc1aeb6d41745c3b0a2fdbe7b142 (commit) via 29cc24dc2effa5cc76af7b365bcdafe671f03545 (commit) via b7181a3f13d58d87a561cd06e00fc37a9fc237b3 (commit) via 5581eaa55c9d32429be88b068b149ebc8b235f2c (commit) via 71e078e380f81d972cb82908a8d13dcc155f5cad (commit) via 3be7ab995e5f2c4472b20008f63299d93a3a806c (commit) via 1882b608abc37314f90bdd2de8ef7f0501a8d5d8 (commit) via 863f2ca462a7dd0a17b0828d037d2594767de092 (commit) via de3ad51a88daa12e9b822e6df339c0e10448d6dd (commit) via e7cf0a6c24811d768d4df91d2c03b71676f9f783 (commit) from 360c1d34b52a2356619b9290811862b9de41de00 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit d6e2cd7830bd474e78980414ad7046443a4a3720 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 22:37:49 2017 +0300
travis: skip install stage for doxygen and checkpatch tests
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/.travis.yml b/.travis.yml index 6fbae4f2..38586242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,7 +118,6 @@ install: - sudo apt-get install linux-headers-`uname -r` - sudo pip install coverage - gem install asciidoctor - - PATH=${PATH//:./node_modules/.bin/}
# DPDK pktio. Note that cache must be purged if dpdk version changes. - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} @@ -265,6 +264,8 @@ jobs: - stage: test env: TEST=doxygen compiler: gcc + install: + - true script: # doxygen does not trap on warnings, check for them here. - ./bootstrap @@ -274,6 +275,8 @@ jobs: - stage: test env: TEST=checkpatch compiler: gcc + install: + - true script: - echo ${TRAVIS_COMMIT_RANGE}; - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/.//'`;
commit e114fba150e07e7f25b86306c30003416324955e Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 22:36:34 2017 +0300
travis: don't error out if there are no patches to check
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/.travis.yml b/.travis.yml index 5a32ad5d..6fbae4f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -277,7 +277,7 @@ jobs: script: - echo ${TRAVIS_COMMIT_RANGE}; - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/.//'`; - - if [ -z "${ODP_PATCHES}" ]; then env; exit 1; fi; + - if [ -z "${ODP_PATCHES}" ]; then env; exit 0; fi; - ./scripts/ci-checkpatches.sh ${ODP_PATCHES};
after_failure:
commit 316d020fc2e3fee86b955eec4946290d90fb2eb1 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 20:36:18 2017 +0300
test: misc rewrites in Makefile.am files
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am index 5f2cc53d..7d42b07e 100644 --- a/test/common_plat/miscellaneous/Makefile.am +++ b/test/common_plat/miscellaneous/Makefile.am @@ -5,6 +5,4 @@ bin_PROGRAMS = odp_api_from_cpp$(EXEEXT) TESTS = odp_api_from_cpp$(EXEEXT) endif
-odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS) - odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index 79e8e39a..ef9537b1 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -24,14 +24,6 @@ endif
bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
-odp_bench_packet_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_crypto_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_perf_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_l2fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_ordered_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_sched_latency_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test - noinst_HEADERS = \ $(top_srcdir)/test/test_debug.h
diff --git a/test/common_plat/validation/Makefile.am b/test/common_plat/validation/Makefile.am index 5d525fba..32854378 100644 --- a/test/common_plat/validation/Makefile.am +++ b/test/common_plat/validation/Makefile.am @@ -1,3 +1,3 @@ -if cunit_support +if test_vald SUBDIRS = api endif diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/test/linux-generic/mmap_vlan_ins/Makefile.am index 2f38e5c6..e42b5254 100644 --- a/test/linux-generic/mmap_vlan_ins/Makefile.am +++ b/test/linux-generic/mmap_vlan_ins/Makefile.am @@ -1,14 +1,16 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
-dist_check_SCRIPTS = vlan.pcap \ +dist_check_SCRIPTS = \ mmap_vlan_ins.sh \ pktio_env
+dist_check_DATA = vlan.pcap + test_SCRIPTS = $(dist_check_SCRIPTS) +test_DATA = $(dist_check_DATA)
test_PROGRAMS = plat_mmap_vlan_ins$(EXEEXT) -plat_mmap_vlan_ins_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
# Clonned from example odp_l2fwd simple plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c diff --git a/test/linux-generic/performance/Makefile.am b/test/linux-generic/performance/Makefile.am index cb72fce9..0b5da671 100644 --- a/test/linux-generic/performance/Makefile.am +++ b/test/linux-generic/performance/Makefile.am @@ -10,4 +10,4 @@ if test_perf_proc TESTS = $(TESTSCRIPTS) endif
-EXTRA_DIST = $(TESTSCRIPTS) +dist_check_SCRIPTS = $(TESTSCRIPTS) diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am index eaa8bdd6..4287fbc0 100644 --- a/test/linux-generic/pktio_ipc/Makefile.am +++ b/test/linux-generic/pktio_ipc/Makefile.am @@ -4,9 +4,6 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation test_PROGRAMS = pktio_ipc1\ pktio_ipc2
-pktio_ipc1_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -pktio_ipc2_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example - pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c ipc_common.h pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c ipc_common.h
commit 4c8e7df6337e79cef937ad3246d61e75b7d2164d Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 20:29:21 2017 +0300
test: build all tests with -static
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/Makefile.inc b/test/Makefile.inc index 8bd21432..a45fcf87 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -18,7 +18,7 @@ INCFLAGS = \ AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS = $(CUNIT_CFLAGS)
-AM_LDFLAGS = -L$(LIB) +AM_LDFLAGS = -L$(LIB) -static
@VALGRIND_CHECK_RULES@ valgrind_tools = memcheck diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am index 48240efe..5f2cc53d 100644 --- a/test/common_plat/miscellaneous/Makefile.am +++ b/test/common_plat/miscellaneous/Makefile.am @@ -7,6 +7,4 @@ endif
odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS)
-odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static - odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index c67de749..79e8e39a 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -24,19 +24,12 @@ endif
bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
-odp_bench_packet_LDFLAGS = $(AM_LDFLAGS) -static odp_bench_packet_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_crypto_LDFLAGS = $(AM_LDFLAGS) -static odp_crypto_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_perf_LDFLAGS = $(AM_LDFLAGS) -static odp_pktio_perf_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_l2fwd_LDFLAGS = $(AM_LDFLAGS) -static odp_l2fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_ordered_LDFLAGS = $(AM_LDFLAGS) -static odp_pktio_ordered_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_sched_latency_LDFLAGS = $(AM_LDFLAGS) -static odp_sched_latency_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_scheduling_LDFLAGS = $(AM_LDFLAGS) -static odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test
noinst_HEADERS = \ diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index d763a817..c4e80eb7 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -3,7 +3,6 @@ include $(top_srcdir)/test/Makefile.inc COMMON_DIR = $(top_builddir)/test/common_plat/common
AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common -AM_LDFLAGS += -static AM_LDFLAGS += $(DPDK_PMDS)
AM_CFLAGS += $(CUNIT_CFLAGS) diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/test/linux-generic/mmap_vlan_ins/Makefile.am index 5fb6afd9..2f38e5c6 100644 --- a/test/linux-generic/mmap_vlan_ins/Makefile.am +++ b/test/linux-generic/mmap_vlan_ins/Makefile.am @@ -8,7 +8,6 @@ dist_check_SCRIPTS = vlan.pcap \ test_SCRIPTS = $(dist_check_SCRIPTS)
test_PROGRAMS = plat_mmap_vlan_ins$(EXEEXT) -plat_mmap_vlan_ins_LDFLAGS = $(AM_LDFLAGS) -static plat_mmap_vlan_ins_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
# Clonned from example odp_l2fwd simple diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am index ad5de50b..eaa8bdd6 100644 --- a/test/linux-generic/pktio_ipc/Makefile.am +++ b/test/linux-generic/pktio_ipc/Makefile.am @@ -5,9 +5,7 @@ test_PROGRAMS = pktio_ipc1\ pktio_ipc2
pktio_ipc1_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -pktio_ipc1_LDFLAGS = $(AM_LDFLAGS) -static pktio_ipc2_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -pktio_ipc2_LDFLAGS = $(AM_LDFLAGS) -static
pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c ipc_common.h pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c ipc_common.h diff --git a/test/linux-generic/validation/api/shmem/Makefile.am b/test/linux-generic/validation/api/shmem/Makefile.am index 6ff77b00..962450e5 100644 --- a/test/linux-generic/validation/api/shmem/Makefile.am +++ b/test/linux-generic/validation/api/shmem/Makefile.am @@ -13,12 +13,10 @@ shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h shmem_odp1_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ $(INCODP) -shmem_odp1_LDFLAGS = $(AM_LDFLAGS) shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP)
shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h shmem_odp2_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ $(INCODP) -shmem_odp2_LDFLAGS = $(AM_LDFLAGS) shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP)
commit 01f75d6582aadc1aeb6d41745c3b0a2fdbe7b142 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Sep 7 14:10:10 2017 +0300
test: pktio_ipc: switch to test_debug rather than example_debug
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/linux-generic/pktio_ipc/ipc_common.c b/test/linux-generic/pktio_ipc/ipc_common.c index 2004c7d2..e15d3913 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.c +++ b/test/linux-generic/pktio_ipc/ipc_common.c @@ -29,14 +29,14 @@ int ipc_odp_packet_send_or_free(odp_pktio_t pktio, end_time = odp_time_sum(start_time, wait);
if (odp_pktout_queue(pktio, &pktout, 1) != 1) { - EXAMPLE_ERR("no output queue\n"); + LOG_ERR("no output queue\n"); return -1; }
while (sent != num) { ret = odp_pktout_send(pktout, &pkt_tbl[sent], num - sent); if (ret < 0) { - EXAMPLE_ERR("odp_pktout_send return %d\n", ret); + LOG_ERR("odp_pktout_send return %d\n", ret); for (i = sent; i < num; i++) odp_packet_free(pkt_tbl[i]); return -1; @@ -47,7 +47,7 @@ int ipc_odp_packet_send_or_free(odp_pktio_t pktio, if (odp_time_cmp(end_time, odp_time_local()) < 0) { for (i = sent; i < num; i++) odp_packet_free(pkt_tbl[i]); - EXAMPLE_ERR("Send Timeout!\n"); + LOG_ERR("Send Timeout!\n"); return -1; } } @@ -71,17 +71,17 @@ odp_pktio_t create_pktio(odp_pool_t pool, int master_pid) printf("pid: %d, create IPC pktio %s\n", getpid(), name); ipc_pktio = odp_pktio_open(name, pool, &pktio_param); if (ipc_pktio == ODP_PKTIO_INVALID) { - EXAMPLE_ERR("Error: ipc pktio %s create failed.\n", name); + LOG_ERR("Error: ipc pktio %s create failed.\n", name); return ODP_PKTIO_INVALID; }
if (odp_pktin_queue_config(ipc_pktio, NULL)) { - EXAMPLE_ERR("Input queue config failed\n"); + LOG_ERR("Input queue config failed\n"); return ODP_PKTIO_INVALID; }
if (odp_pktout_queue_config(ipc_pktio, NULL)) { - EXAMPLE_ERR("Output queue config failed\n"); + LOG_ERR("Output queue config failed\n"); return ODP_PKTIO_INVALID; }
diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index 334788f3..2b04b144 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -20,7 +20,7 @@ #include <signal.h> #include <sys/wait.h>
-#include <example_debug.h> +#include <test_debug.h>
#include <odp.h> #include <odp/helper/odph_api.h> diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c index b1ed21b8..ee46d1da 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc1.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c @@ -77,7 +77,7 @@ static int pktio_run_loop(odp_pool_t pool) return -1;
if (odp_pktin_queue(ipc_pktio, &pktin, 1) != 1) { - EXAMPLE_ERR("no input queue\n"); + LOG_ERR("no input queue\n"); return -1; }
@@ -107,8 +107,8 @@ static int pktio_run_loop(odp_pool_t pool) cycle = odp_time_local(); diff = odp_time_diff(cycle, start_cycle); if (odp_time_cmp(wait, diff) < 0) { - EXAMPLE_DBG("exit after %d seconds\n", - run_time_sec); + LOG_DBG("exit after %d seconds\n", + run_time_sec); break; } } @@ -132,7 +132,7 @@ static int pktio_run_loop(odp_pool_t pool) stat_errors++; stat_free++; odp_packet_free(pkt); - EXAMPLE_ERR("invalid l4 offset\n"); + LOG_ERR("invalid l4 offset\n"); }
off += ODPH_UDPHDR_LEN; @@ -143,7 +143,7 @@ static int pktio_run_loop(odp_pool_t pool) stat_errors++; stat_free++; odp_packet_free(pkt); - EXAMPLE_DBG("error\n"); + LOG_DBG("error\n"); continue; }
@@ -157,7 +157,7 @@ static int pktio_run_loop(odp_pool_t pool) stat_errors++; stat_free++; odp_packet_free(pkt); - EXAMPLE_DBG("error\n"); + LOG_DBG("error\n"); continue; }
@@ -184,7 +184,7 @@ static int pktio_run_loop(odp_pool_t pool) if (head.seq != cnt_recv && sync_cnt) { stat_errors++; odp_packet_free(pkt); - EXAMPLE_DBG("head.seq %d - " + LOG_DBG("head.seq %d - " "cnt_recv %" PRIu64 "" " = %" PRIu64 "\n", head.seq, cnt_recv, @@ -226,7 +226,7 @@ static int pktio_run_loop(odp_pool_t pool)
off = odp_packet_l4_offset(pkt); if (off == ODP_PACKET_OFFSET_INVALID) - EXAMPLE_ABORT("packet L4 offset not set"); + LOG_ABORT("packet L4 offset not set");
head.magic = TEST_SEQ_MAGIC; head.seq = cnt++; @@ -235,20 +235,20 @@ static int pktio_run_loop(odp_pool_t pool) ret = odp_packet_copy_from_mem(pkt, off, sizeof(head), &head); if (ret) - EXAMPLE_ABORT("unable to copy in head data"); + LOG_ABORT("unable to copy in head data");
tail.magic = TEST_SEQ_MAGIC; off = odp_packet_len(pkt) - sizeof(pkt_tail_t); ret = odp_packet_copy_from_mem(pkt, off, sizeof(tail), &tail); if (ret) - EXAMPLE_ABORT("unable to copy in tail data"); + LOG_ABORT("unable to copy in tail data"); }
/* 5. Send packets to ipc_pktio */ ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, pkts); if (ret < 0) { - EXAMPLE_DBG("unable to sending to ipc pktio\n"); + LOG_DBG("unable to sending to ipc pktio\n"); break; }
@@ -275,14 +275,14 @@ static int pktio_run_loop(odp_pool_t pool) /* cleanup and exit */ ret = odp_pktio_stop(ipc_pktio); if (ret) { - EXAMPLE_DBG("odp_pktio_stop error %d\n", ret); + LOG_DBG("odp_pktio_stop error %d\n", ret); return -1; }
exit: ret = odp_pktio_close(ipc_pktio); if (ret) { - EXAMPLE_DBG("odp_pktio_close error %d\n", ret); + LOG_DBG("odp_pktio_close error %d\n", ret); return -1; }
@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
/* Init ODP before calling anything else */ if (odp_init_global(&instance, NULL, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + LOG_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); }
@@ -329,7 +329,7 @@ int main(int argc, char *argv[])
/* Init this thread */ if (odp_init_local(instance, ODP_THREAD_WORKER)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + LOG_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); }
@@ -345,7 +345,7 @@ int main(int argc, char *argv[])
pool = odp_pool_create(TEST_IPC_POOL_NAME, ¶ms); if (pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + LOG_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); }
@@ -354,20 +354,20 @@ int main(int argc, char *argv[]) ret = pktio_run_loop(pool);
if (odp_pool_destroy(pool)) { - EXAMPLE_ERR("Error: odp_pool_destroy() failed.\n"); + LOG_ERR("Error: odp_pool_destroy() failed.\n"); exit(EXIT_FAILURE); }
if (odp_term_local()) { - EXAMPLE_ERR("Error: odp_term_local() failed.\n"); + LOG_ERR("Error: odp_term_local() failed.\n"); exit(EXIT_FAILURE); }
if (odp_term_global(instance)) { - EXAMPLE_ERR("Error: odp_term_global() failed.\n"); + LOG_ERR("Error: odp_term_global() failed.\n"); exit(EXIT_FAILURE); }
- EXAMPLE_DBG("return %d\n", ret); + LOG_DBG("return %d\n", ret); return ret; } diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c index 062ed9b7..deb6eddf 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc2.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c @@ -44,7 +44,7 @@ static int ipc_second_process(int master_pid)
pool = odp_pool_create(TEST_IPC_POOL_NAME, ¶ms); if (pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + LOG_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); }
@@ -77,7 +77,7 @@ static int ipc_second_process(int master_pid)
if (odp_pktin_queue(ipc_pktio, &pktin, 1) != 1) { odp_pool_destroy(pool); - EXAMPLE_ERR("no input queue\n"); + LOG_ERR("no input queue\n"); return -1; }
@@ -105,8 +105,8 @@ static int ipc_second_process(int master_pid) cycle = odp_time_local(); diff = odp_time_diff(cycle, start_cycle); if (odp_time_cmp(wait, diff) < 0) { - EXAMPLE_DBG("exit after %d seconds\n", - run_time_sec); + LOG_DBG("exit after %d seconds\n", + run_time_sec); break; } } @@ -123,7 +123,7 @@ static int ipc_second_process(int master_pid)
off = odp_packet_l4_offset(pkt); if (off == ODP_PACKET_OFFSET_INVALID) { - EXAMPLE_ERR("invalid l4 offset\n"); + LOG_ERR("invalid l4 offset\n"); for (int j = i; j < pkts; j++) odp_packet_free(pkt_tbl[j]); break; @@ -133,10 +133,10 @@ static int ipc_second_process(int master_pid) ret = odp_packet_copy_to_mem(pkt, off, sizeof(head), &head); if (ret) - EXAMPLE_ABORT("unable copy out head data"); + LOG_ABORT("unable copy out head data");
if (head.magic != TEST_SEQ_MAGIC) { - EXAMPLE_ERR("Wrong head magic! %x", head.magic); + LOG_ERR("Wrong head magic! %x", head.magic); for (int j = i; j < pkts; j++) odp_packet_free(pkt_tbl[j]); break; @@ -147,13 +147,13 @@ static int ipc_second_process(int master_pid) ret = odp_packet_copy_from_mem(pkt, off, sizeof(head), &head); if (ret) - EXAMPLE_ABORT("unable to copy in head data"); + LOG_ABORT("unable to copy in head data"); }
/* send all packets back */ ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, i); if (ret < 0) - EXAMPLE_ABORT("can not send packets\n"); + LOG_ABORT("can not send packets\n");
stat_pkts += ret;
@@ -174,13 +174,13 @@ static int ipc_second_process(int master_pid) sizeof(head), &head); if (ret) - EXAMPLE_ABORT("unable to copy in head data"); + LOG_ABORT("unable to copy in head data");
pkt_tbl[0] = alloc_pkt; ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, 1); if (ret < 0) - EXAMPLE_ABORT("can not send packets\n"); + LOG_ABORT("can not send packets\n"); stat_pkts += 1; } } @@ -188,20 +188,20 @@ static int ipc_second_process(int master_pid) /* cleanup and exit */ ret = odp_pktio_stop(ipc_pktio); if (ret) { - EXAMPLE_DBG("ipc2: odp_pktio_stop error %d\n", ret); + LOG_DBG("ipc2: odp_pktio_stop error %d\n", ret); return -1; }
not_started: ret = odp_pktio_close(ipc_pktio); if (ret) { - EXAMPLE_DBG("ipc2: odp_pktio_close error %d\n", ret); + LOG_DBG("ipc2: odp_pktio_close error %d\n", ret); return -1; }
ret = odp_pool_destroy(pool); if (ret) - EXAMPLE_DBG("ipc2: pool_destroy error %d\n", ret); + LOG_DBG("ipc2: pool_destroy error %d\n", ret);
return stat_pkts > 1000 ? 0 : -1; } @@ -219,7 +219,7 @@ int main(int argc, char *argv[]) parse_args(argc, argv);
if (odp_init_global(&instance, NULL, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + LOG_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); }
@@ -243,19 +243,19 @@ int main(int argc, char *argv[])
/* Init this thread */ if (odp_init_local(instance, ODP_THREAD_WORKER)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + LOG_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); }
ret = ipc_second_process(master_pid);
if (odp_term_local()) { - EXAMPLE_ERR("Error: odp_term_local() failed.\n"); + LOG_ERR("Error: odp_term_local() failed.\n"); exit(EXIT_FAILURE); }
if (odp_term_global(instance)) { - EXAMPLE_ERR("Error: odp_term_global() failed.\n"); + LOG_ERR("Error: odp_term_global() failed.\n"); exit(EXIT_FAILURE); }
commit 29cc24dc2effa5cc76af7b365bcdafe671f03545 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 19:49:30 2017 +0300
helper: test: rework build system
- Stop using extra libraries just to create a test executable - Stop using EXTRA_DIST to distribute headers, include them into _SOURCES - Stop using unnecessary dist_ prefixes, sources are distributed automatically
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index e30a1e71..983e2c68 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -44,15 +44,13 @@ if test_helper TESTS = $(EXECUTABLES) $(TESTSCRIPTS) endif
-dist_bin_SCRIPTS = - test_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
-EXTRA_DIST = odpthreads_as_processes odpthreads_as_pthreads +dist_check_SCRIPTS = odpthreads_as_processes odpthreads_as_pthreads
-dist_chksum_SOURCES = chksum.c -dist_cuckootable_SOURCES = cuckootable.c -dist_odpthreads_SOURCES = odpthreads.c -dist_parse_SOURCES = parse.c -dist_table_SOURCES = table.c -dist_iplookuptable_SOURCES = iplookuptable.c +chksum_SOURCES = chksum.c +cuckootable_SOURCES = cuckootable.c +odpthreads_SOURCES = odpthreads.c +parse_SOURCES = parse.c +table_SOURCES = table.c +iplookuptable_SOURCES = iplookuptable.c
commit b7181a3f13d58d87a561cd06e00fc37a9fc237b3 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 19:49:30 2017 +0300
test: rework build system
- Stop using extra libraries just to create a test executable - Stop using EXTRA_DIST to distribute headers, include them into _SOURCES - Stop using unnecessary dist_ prefixes, sources are distributed automatically
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/common_plat/common/Makefile.am b/test/common_plat/common/Makefile.am index 9fd08ee8..5736214a 100644 --- a/test/common_plat/common/Makefile.am +++ b/test/common_plat/common/Makefile.am @@ -2,12 +2,10 @@ include $(top_srcdir)/test/Makefile.inc
noinst_LTLIBRARIES = libcunit_common.la libcpumask_common.la libthrmask_common.la
-libcunit_common_la_SOURCES = odp_cunit_common.c +libcunit_common_la_SOURCES = odp_cunit_common.c odp_cunit_common.h libcunit_common_la_LIBADD = $(CUNIT_LIBS)
-libcpumask_common_la_SOURCES = mask_common.c +libcpumask_common_la_SOURCES = mask_common.c mask_common.h
-libthrmask_common_la_SOURCES = mask_common.c +libthrmask_common_la_SOURCES = mask_common.c mask_common.h libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK - -EXTRA_DIST = mask_common.h odp_cunit_common.h diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am index 7d8cf353..48240efe 100644 --- a/test/common_plat/miscellaneous/Makefile.am +++ b/test/common_plat/miscellaneous/Makefile.am @@ -9,4 +9,4 @@ odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS)
odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static
-dist_odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp +odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index 3299f03f..c67de749 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -40,16 +40,15 @@ odp_scheduling_LDFLAGS = $(AM_LDFLAGS) -static odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test
noinst_HEADERS = \ - $(top_srcdir)/test/test_debug.h \ - dummy_crc.h + $(top_srcdir)/test/test_debug.h
-dist_odp_bench_packet_SOURCES = odp_bench_packet.c -dist_odp_crypto_SOURCES = odp_crypto.c -dist_odp_pktio_ordered_SOURCES = odp_pktio_ordered.c -dist_odp_sched_latency_SOURCES = odp_sched_latency.c -dist_odp_scheduling_SOURCES = odp_scheduling.c -dist_odp_pktio_perf_SOURCES = odp_pktio_perf.c +odp_bench_packet_SOURCES = odp_bench_packet.c +odp_crypto_SOURCES = odp_crypto.c +odp_pktio_ordered_SOURCES = odp_pktio_ordered.c dummy_crc.h +odp_sched_latency_SOURCES = odp_sched_latency.c +odp_scheduling_SOURCES = odp_scheduling.c +odp_pktio_perf_SOURCES = odp_pktio_perf.c
-EXTRA_DIST = $(TESTSCRIPTS) +dist_check_SCRIPTS = $(TESTSCRIPTS)
-dist_check_SCRIPTS = udp64.pcap +dist_check_DATA = udp64.pcap diff --git a/test/common_plat/validation/api/atomic/Makefile.am b/test/common_plat/validation/api/atomic/Makefile.am index 9b6bd631..b09d3b88 100644 --- a/test/common_plat/validation/api/atomic/Makefile.am +++ b/test/common_plat/validation/api/atomic/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestatomic.la -libtestatomic_la_SOURCES = atomic.c - test_PROGRAMS = atomic_main$(EXEEXT) -dist_atomic_main_SOURCES = atomic_main.c -atomic_main_LDADD = libtestatomic.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = atomic.h +atomic_main_SOURCES = atomic_main.c atomic.c atomic.h +atomic_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/barrier/Makefile.am b/test/common_plat/validation/api/barrier/Makefile.am index 8fc632c2..4dfb1d1e 100644 --- a/test/common_plat/validation/api/barrier/Makefile.am +++ b/test/common_plat/validation/api/barrier/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestbarrier.la -libtestbarrier_la_SOURCES = barrier.c - test_PROGRAMS = barrier_main$(EXEEXT) -dist_barrier_main_SOURCES = barrier_main.c -barrier_main_LDADD = libtestbarrier.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = barrier.h +barrier_main_SOURCES = barrier_main.c barrier.c barrier.h +barrier_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/buffer/Makefile.am b/test/common_plat/validation/api/buffer/Makefile.am index add2a341..ae6ce0a4 100644 --- a/test/common_plat/validation/api/buffer/Makefile.am +++ b/test/common_plat/validation/api/buffer/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestbuffer.la -libtestbuffer_la_SOURCES = buffer.c - test_PROGRAMS = buffer_main$(EXEEXT) -dist_buffer_main_SOURCES = buffer_main.c -buffer_main_LDADD = libtestbuffer.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = buffer.h +buffer_main_SOURCES = buffer_main.c buffer.c buffer.h +buffer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/classification/Makefile.am b/test/common_plat/validation/api/classification/Makefile.am index df382c51..f177528e 100644 --- a/test/common_plat/validation/api/classification/Makefile.am +++ b/test/common_plat/validation/api/classification/Makefile.am @@ -1,14 +1,12 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestclassification.la -libtestclassification_la_SOURCES = odp_classification_basic.c \ - odp_classification_tests.c \ - odp_classification_test_pmr.c \ - odp_classification_common.c \ - classification.c - test_PROGRAMS = classification_main$(EXEEXT) -dist_classification_main_SOURCES = classification_main.c -classification_main_LDADD = libtestclassification.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = classification.h odp_classification_testsuites.h +classification_main_SOURCES = classification_main.c \ + odp_classification_basic.c \ + odp_classification_tests.c \ + odp_classification_testsuites.h \ + odp_classification_test_pmr.c \ + odp_classification_common.c \ + classification.c \ + classification.h +classification_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/cpumask/Makefile.am b/test/common_plat/validation/api/cpumask/Makefile.am index ec5fce33..ddafb9ab 100644 --- a/test/common_plat/validation/api/cpumask/Makefile.am +++ b/test/common_plat/validation/api/cpumask/Makefile.am @@ -1,11 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestcpumask.la -libtestcpumask_la_SOURCES = cpumask.c -libtestcpumask_la_LIBADD = $(LIBCPUMASK_COMMON) - test_PROGRAMS = cpumask_main$(EXEEXT) -dist_cpumask_main_SOURCES = cpumask_main.c -cpumask_main_LDADD = libtestcpumask.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = cpumask.h +cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h +cpumask_main_LDADD = $(LIBCPUMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/crypto/Makefile.am b/test/common_plat/validation/api/crypto/Makefile.am index 3ea41b41..6660e1b2 100644 --- a/test/common_plat/validation/api/crypto/Makefile.am +++ b/test/common_plat/validation/api/crypto/Makefile.am @@ -1,11 +1,11 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestcrypto.la -libtestcrypto_la_SOURCES = crypto.c \ - odp_crypto_test_inp.c - test_PROGRAMS = crypto_main$(EXEEXT) -dist_crypto_main_SOURCES = crypto_main.c -crypto_main_LDADD = libtestcrypto.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = crypto.h odp_crypto_test_inp.h test_vectors.h test_vectors_len.h +crypto_main_SOURCES = crypto_main.c \ + crypto.c \ + crypto.h \ + odp_crypto_test_inp.c \ + odp_crypto_test_inp.h \ + test_vectors.h \ + test_vectors_len.h +crypto_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/errno/Makefile.am b/test/common_plat/validation/api/errno/Makefile.am index a24275d6..8f7b2e88 100644 --- a/test/common_plat/validation/api/errno/Makefile.am +++ b/test/common_plat/validation/api/errno/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtesterrno.la -libtesterrno_la_SOURCES = errno.c - test_PROGRAMS = errno_main$(EXEEXT) -dist_errno_main_SOURCES = errno_main.c -errno_main_LDADD = libtesterrno.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = errno.h +errno_main_SOURCES = errno_main.c errno.c errno.h +errno_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/hash/Makefile.am b/test/common_plat/validation/api/hash/Makefile.am index b899b8bd..b37f2e00 100644 --- a/test/common_plat/validation/api/hash/Makefile.am +++ b/test/common_plat/validation/api/hash/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtesthash.la -libtesthash_la_SOURCES = hash.c - test_PROGRAMS = hash_main$(EXEEXT) -dist_hash_main_SOURCES = hash_main.c -hash_main_LDADD = libtesthash.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = hash.h +hash_main_SOURCES = hash_main.c hash.c hash.h +hash_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/init/Makefile.am b/test/common_plat/validation/api/init/Makefile.am index 0793e642..ba25c61f 100644 --- a/test/common_plat/validation/api/init/Makefile.am +++ b/test/common_plat/validation/api/init/Makefile.am @@ -1,16 +1,12 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestinit.la -libtestinit_la_SOURCES = init.c
# most platforms are expected not to support multiple ODP inits # following each other: therefore 3 separate binaries are # created, each containing its ODP init test. test_PROGRAMS = init_main_abort$(EXEEXT) init_main_log$(EXEEXT) init_main_ok$(EXEEXT) -dist_init_main_abort_SOURCES = init_main_abort.c -dist_init_main_log_SOURCES = init_main_log.c -dist_init_main_ok_SOURCES = init_main_ok.c -init_main_abort_LDADD = libtestinit.la $(LIBCUNIT_COMMON) $(LIBODP) -init_main_log_LDADD = libtestinit.la $(LIBCUNIT_COMMON) $(LIBODP) -init_main_ok_LDADD = libtestinit.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = init.h +init_main_abort_SOURCES = init_main_abort.c init.c init.h +init_main_log_SOURCES = init_main_log.c init.c init.h +init_main_ok_SOURCES = init_main_ok.c init.c init.h +init_main_abort_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) +init_main_log_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) +init_main_ok_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/lock/Makefile.am b/test/common_plat/validation/api/lock/Makefile.am index 29993df4..80740282 100644 --- a/test/common_plat/validation/api/lock/Makefile.am +++ b/test/common_plat/validation/api/lock/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestlock.la -libtestlock_la_SOURCES = lock.c - test_PROGRAMS = lock_main$(EXEEXT) -dist_lock_main_SOURCES = lock_main.c -lock_main_LDADD = libtestlock.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = lock.h +lock_main_SOURCES = lock_main.c lock.c lock.h +lock_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/packet/Makefile.am b/test/common_plat/validation/api/packet/Makefile.am index d8ebc1a2..fb356997 100644 --- a/test/common_plat/validation/api/packet/Makefile.am +++ b/test/common_plat/validation/api/packet/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestpacket.la -libtestpacket_la_SOURCES = packet.c - test_PROGRAMS = packet_main$(EXEEXT) -dist_packet_main_SOURCES = packet_main.c -packet_main_LDADD = libtestpacket.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = packet.h +packet_main_SOURCES = packet_main.c packet.c packet.h +packet_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am index c6368fba..eb4b6038 100644 --- a/test/common_plat/validation/api/pktio/Makefile.am +++ b/test/common_plat/validation/api/pktio/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestpktio.la -libtestpktio_la_SOURCES = pktio.c - test_PROGRAMS = pktio_main$(EXEEXT) -dist_pktio_main_SOURCES = pktio_main.c parser.c -pktio_main_LDADD = libtestpktio.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = pktio.h parser.h +pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h +pktio_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/pool/Makefile.am b/test/common_plat/validation/api/pool/Makefile.am index 1eb8d714..85a37b05 100644 --- a/test/common_plat/validation/api/pool/Makefile.am +++ b/test/common_plat/validation/api/pool/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestpool.la -libtestpool_la_SOURCES = pool.c - test_PROGRAMS = pool_main$(EXEEXT) -dist_pool_main_SOURCES = pool_main.c -pool_main_LDADD = libtestpool.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = pool.h +pool_main_SOURCES = pool_main.c pool.c pool.h +pool_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/queue/Makefile.am b/test/common_plat/validation/api/queue/Makefile.am index a477e3c5..a5b6a9b1 100644 --- a/test/common_plat/validation/api/queue/Makefile.am +++ b/test/common_plat/validation/api/queue/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestqueue.la -libtestqueue_la_SOURCES = queue.c - test_PROGRAMS = queue_main$(EXEEXT) -dist_queue_main_SOURCES = queue_main.c -queue_main_LDADD = libtestqueue.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = queue.h +queue_main_SOURCES = queue_main.c queue.c queue.h +queue_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/random/Makefile.am b/test/common_plat/validation/api/random/Makefile.am index 69259a4d..e026f045 100644 --- a/test/common_plat/validation/api/random/Makefile.am +++ b/test/common_plat/validation/api/random/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestrandom.la -libtestrandom_la_SOURCES = random.c - test_PROGRAMS = random_main$(EXEEXT) -dist_random_main_SOURCES = random_main.c -random_main_LDADD = libtestrandom.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = random.h +random_main_SOURCES = random_main.c random.c random.h +random_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/scheduler/Makefile.am b/test/common_plat/validation/api/scheduler/Makefile.am index 2555cab8..6c71b010 100644 --- a/test/common_plat/validation/api/scheduler/Makefile.am +++ b/test/common_plat/validation/api/scheduler/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestscheduler.la -libtestscheduler_la_SOURCES = scheduler.c - test_PROGRAMS = scheduler_main$(EXEEXT) -dist_scheduler_main_SOURCES = scheduler_main.c -scheduler_main_LDADD = libtestscheduler.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = scheduler.h +scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h +scheduler_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/shmem/Makefile.am b/test/common_plat/validation/api/shmem/Makefile.am index da88af66..d955cc22 100644 --- a/test/common_plat/validation/api/shmem/Makefile.am +++ b/test/common_plat/validation/api/shmem/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestshmem.la -libtestshmem_la_SOURCES = shmem.c - test_PROGRAMS = shmem_main$(EXEEXT) -dist_shmem_main_SOURCES = shmem_main.c -shmem_main_LDADD = libtestshmem.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = shmem.h +shmem_main_SOURCES = shmem_main.c shmem.c shmem.h +shmem_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/std_clib/Makefile.am b/test/common_plat/validation/api/std_clib/Makefile.am index e2fc0ccf..919c2556 100644 --- a/test/common_plat/validation/api/std_clib/Makefile.am +++ b/test/common_plat/validation/api/std_clib/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libteststd_clib.la -libteststd_clib_la_SOURCES = std_clib.c - test_PROGRAMS = std_clib_main$(EXEEXT) -dist_std_clib_main_SOURCES = std_clib_main.c -std_clib_main_LDADD = libteststd_clib.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = std_clib.h +std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h +std_clib_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/system/Makefile.am b/test/common_plat/validation/api/system/Makefile.am index 3789c36c..15e6d49a 100644 --- a/test/common_plat/validation/api/system/Makefile.am +++ b/test/common_plat/validation/api/system/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestsystem.la -libtestsystem_la_SOURCES = system.c - test_PROGRAMS = system_main$(EXEEXT) -dist_system_main_SOURCES = system_main.c -system_main_LDADD = libtestsystem.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = system.h +system_main_SOURCES = system_main.c system.c system.h +system_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/thread/Makefile.am b/test/common_plat/validation/api/thread/Makefile.am index eaf680cf..59e136b2 100644 --- a/test/common_plat/validation/api/thread/Makefile.am +++ b/test/common_plat/validation/api/thread/Makefile.am @@ -1,12 +1,6 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestthread.la -libtestthread_la_SOURCES = thread.c -libtestthread_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK -libtestthread_la_LIBADD = $(LIBTHRMASK_COMMON) - test_PROGRAMS = thread_main$(EXEEXT) -dist_thread_main_SOURCES = thread_main.c -thread_main_LDADD = libtestthread.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = thread.h +thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK +thread_main_SOURCES = thread_main.c thread.c thread.h +thread_main_LDADD = $(LIBTHRMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/time/Makefile.am b/test/common_plat/validation/api/time/Makefile.am index ca9c0562..faed577f 100644 --- a/test/common_plat/validation/api/time/Makefile.am +++ b/test/common_plat/validation/api/time/Makefile.am @@ -7,13 +7,9 @@ TEST_EXTENSIONS = .sh
TESTS = $(TESTSCRIPTS)
-noinst_LTLIBRARIES = libtesttime.la -libtesttime_la_SOURCES = time.c - test_PROGRAMS = time_main$(EXEEXT) -dist_time_main_SOURCES = time_main.c -time_main_LDADD = libtesttime.la $(LIBCUNIT_COMMON) $(LIBODP) +time_main_SOURCES = time_main.c time.c time_test.h +time_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP)
-EXTRA_DIST = time_test.h $(TESTSCRIPTS) dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/common_plat/validation/api/timer/Makefile.am b/test/common_plat/validation/api/timer/Makefile.am index fe6872f4..4f79020d 100644 --- a/test/common_plat/validation/api/timer/Makefile.am +++ b/test/common_plat/validation/api/timer/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtesttimer.la -libtesttimer_la_SOURCES = timer.c - test_PROGRAMS = timer_main$(EXEEXT) -dist_timer_main_SOURCES = timer_main.c -timer_main_LDADD = libtesttimer.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = timer.h +timer_main_SOURCES = timer_main.c timer.c timer.h +timer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/traffic_mngr/Makefile.am b/test/common_plat/validation/api/traffic_mngr/Makefile.am index 44d50a91..3884a13c 100644 --- a/test/common_plat/validation/api/traffic_mngr/Makefile.am +++ b/test/common_plat/validation/api/traffic_mngr/Makefile.am @@ -7,13 +7,9 @@ TEST_EXTENSIONS = .sh
TESTS = $(TESTSCRIPTS)
-noinst_LTLIBRARIES = libtesttraffic_mngr.la -libtesttraffic_mngr_la_SOURCES = traffic_mngr.c - test_PROGRAMS = traffic_mngr_main$(EXEEXT) -dist_traffic_mngr_main_SOURCES = traffic_mngr_main.c -traffic_mngr_main_LDADD = libtesttraffic_mngr.la -lm $(LIBCUNIT_COMMON) $(LIBODP) +traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h +traffic_mngr_main_LDADD = -lm $(LIBCUNIT_COMMON) $(LIBODP)
-EXTRA_DIST = traffic_mngr.h $(TESTSCRIPTS) dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/test/linux-generic/mmap_vlan_ins/Makefile.am index 5cac159c..5fb6afd9 100644 --- a/test/linux-generic/mmap_vlan_ins/Makefile.am +++ b/test/linux-generic/mmap_vlan_ins/Makefile.am @@ -12,4 +12,4 @@ plat_mmap_vlan_ins_LDFLAGS = $(AM_LDFLAGS) -static plat_mmap_vlan_ins_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
# Clonned from example odp_l2fwd simple -dist_plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c +plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am index 8858bd2f..ad5de50b 100644 --- a/test/linux-generic/pktio_ipc/Makefile.am +++ b/test/linux-generic/pktio_ipc/Makefile.am @@ -9,12 +9,8 @@ pktio_ipc1_LDFLAGS = $(AM_LDFLAGS) -static pktio_ipc2_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example pktio_ipc2_LDFLAGS = $(AM_LDFLAGS) -static
-noinst_HEADERS = $(top_srcdir)/test/test_debug.h - -dist_pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c -dist_pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c - -EXTRA_DIST = ipc_common.h +pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c ipc_common.h +pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c ipc_common.h
dist_check_SCRIPTS = pktio_ipc_run.sh test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/linux-generic/ring/Makefile.am b/test/linux-generic/ring/Makefile.am index 14f60b85..57ba82ae 100644 --- a/test/linux-generic/ring/Makefile.am +++ b/test/linux-generic/ring/Makefile.am @@ -1,15 +1,11 @@ include ../Makefile.inc
-noinst_LTLIBRARIES = libtestring.la -libtestring_la_SOURCES = ring_suites.c ring_basic.c ring_stress.c -libtestring_la_CFLAGS = $(AM_CFLAGS) $(INCCUNIT_COMMON) $(INCODP) - test_PROGRAMS = ring_main$(EXEEXT) -dist_ring_main_SOURCES = ring_main.c - -ring_main_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include -ring_main_LDFLAGS = $(AM_LDFLAGS) -ring_main_LDADD = libtestring.la $(LIBCUNIT_COMMON) $(LIBODP) - -noinst_HEADERS = ring_suites.h - +ring_main_SOURCES = \ + ring_main.c \ + ring_suites.c ring_suites.h \ + ring_basic.c ring_stress.c + +ring_main_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/include \ + $(INCCUNIT_COMMON) $(INCODP) +ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/linux-generic/validation/api/shmem/Makefile.am b/test/linux-generic/validation/api/shmem/Makefile.am index e330d633..6ff77b00 100644 --- a/test/linux-generic/validation/api/shmem/Makefile.am +++ b/test/linux-generic/validation/api/shmem/Makefile.am @@ -1,29 +1,24 @@ include ../Makefile.inc
#the main test program is shmem_linux, which, in turn, starts a shmem_odp: -test_PROGRAMS = shmem_linux$(EXEEXT) -test_extra_PROGRAMS = shmem_odp1$(EXEEXT) shmem_odp2$(EXEEXT) -test_extradir = $(testdir) +test_PROGRAMS = shmem_linux$(EXEEXT) shmem_odp1$(EXEEXT) shmem_odp2$(EXEEXT)
#shmem_linux is stand alone, pure linux (no ODP): -dist_shmem_linux_SOURCES = shmem_linux.c +shmem_linux_SOURCES = shmem_linux.c shmem_linux.h shmem_common.h shmem_linux_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt
#shmem_odp1 and shmem_odp2 are the 2 ODP processes: -dist_shmem_odp1_SOURCES = shmem_odp1.c +shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h shmem_odp1_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ $(INCODP) shmem_odp1_LDFLAGS = $(AM_LDFLAGS) shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP)
-dist_shmem_odp2_SOURCES = shmem_odp2.c +shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h shmem_odp2_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ $(INCODP) shmem_odp2_LDFLAGS = $(AM_LDFLAGS) shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) - - -noinst_HEADERS = shmem_common.h shmem_linux.h shmem_odp1.h shmem_odp2.h diff --git a/test/linux-generic/validation/api/shmem/shmem.h b/test/linux-generic/validation/api/shmem/shmem.h deleted file mode 100644 index 2368a2e1..00000000 --- a/test/linux-generic/validation/api/shmem/shmem.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_LINUX_TEST_SHMEM_H_ -#define _ODP_LINUX_TEST_SHMEM_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void shmem_test_odp_shm_proc(void); - -/* test arrays: */ -extern odp_testinfo_t shmem_linux_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t shmem_linux_suites[]; - -#endif
commit 5581eaa55c9d32429be88b068b149ebc8b235f2c Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 18:51:26 2017 +0300
configure: stop setting AM_* variables
AM_* variables by design should be set by Makefile.am, not by configure.ac. Use CFLAGS/CXXFLAGS instead.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/configure.ac b/configure.ac index f6f69942..d4c07a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -329,6 +329,7 @@ ODP_CHECK_CFLAG([-Wformat-truncation=0]) ODP_CHECK_CFLAG([-Wformat-overflow=0])
ODP_CFLAGS="$ODP_CFLAGS -std=c99" +ODP_CXXFLAGS="$ODP_CXXFLAGS -std=c++11"
# Extra flags for example to suppress certain warning types ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" @@ -347,8 +348,8 @@ esac ########################################################################## # Default include setup ########################################################################## -AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS" -AM_CXXFLAGS="-std=c++11" +CFLAGS="$CFLAGS $ODP_CFLAGS" +CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS"
AC_CONFIG_FILES([Makefile pkgconfig/libodp-linux.pc @@ -359,11 +360,8 @@ AC_CONFIG_FILES([Makefile # distribute the changed variables among the Makefiles
AC_SUBST([LIBS]) -AC_SUBST([AM_CPPFLAGS]) AC_SUBST([CPPFLAGS]) -AC_SUBST([AM_CFLAGS]) AC_SUBST([CFLAGS]) -AC_SUBST([AM_LDFLAGS]) AC_SUBST([LDFLAGS]) AC_SUBST([EXEEXT])
@@ -390,12 +388,8 @@ AC_MSG_RESULT([ cc: ${CC} cc version: ${CC_VERSION} cppflags: ${CPPFLAGS} - am_cppflags: ${AM_CPPFLAGS} - am_cxxflags: ${AM_CXXFLAGS} cflags: ${CFLAGS} - am_cflags: ${AM_CFLAGS} ldflags: ${LDFLAGS} - am_ldflags: ${AM_LDFLAGS} libs: ${LIBS} defs: ${DEFS} static libraries: ${enable_static} diff --git a/example/Makefile.inc b/example/Makefile.inc index 7cc21154..cba385b7 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,6 +1,6 @@ LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) -AM_CFLAGS += \ +AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ -I$(top_srcdir)/platform/@with_platform@/include \ @@ -11,4 +11,4 @@ AM_CFLAGS += \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include
-AM_LDFLAGS += -L$(LIB) +AM_LDFLAGS = -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index fa503f1a..bf75b467 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,7 +2,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc
LIB = $(top_builddir)/lib -AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/include AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ @@ -10,7 +10,7 @@ AM_CPPFLAGS += -I$(top_builddir)/platform/@with_platform@/include AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ AM_CPPFLAGS += -I$(top_builddir)/include
-AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' +AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)'
helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index fdc15f96..e30a1e71 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -17,8 +17,8 @@ INCFLAGS = \
ODP_PLATFORM=${with_platform}
-AM_CPPFLAGS += $(INCFLAGS) -AM_LDFLAGS += -static +AM_CPPFLAGS = $(INCFLAGS) +AM_LDFLAGS = -static
EXECUTABLES = chksum$(EXEEXT) \ cuckootable$(EXEEXT) \ diff --git a/platform/Makefile.inc b/platform/Makefile.inc index a88e8384..f6722560 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -8,9 +8,9 @@ pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp-linux.pc VPATH = $(srcdir) $(builddir) lib_LTLIBRARIES = $(LIB)/libodp-linux.la
-AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' +AM_LDFLAGS = -version-number '$(ODP_LIBSO_VERSION)'
-AM_CFLAGS += "-DGIT_HASH=$(VERSION)" +AM_CFLAGS = "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS)
AM_CFLAGS += @PTHREAD_CFLAGS@ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e644505e..f5f65384 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,7 +3,7 @@
include $(top_srcdir)/platform/Makefile.inc
-AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CPPFLAGS += -I$(top_builddir)/include diff --git a/test/Makefile.inc b/test/Makefile.inc index f5bb7674..8bd21432 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -16,9 +16,9 @@ INCFLAGS = \ -I$(top_builddir)/include
AM_CPPFLAGS = $(INCFLAGS) -AM_CFLAGS += $(CUNIT_CFLAGS) +AM_CFLAGS = $(CUNIT_CFLAGS)
-AM_LDFLAGS += -L$(LIB) +AM_LDFLAGS = -L$(LIB)
@VALGRIND_CHECK_RULES@ valgrind_tools = memcheck diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index ff99fbc9..cfb61441 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -2,9 +2,9 @@ # build specific ODP applications, (i.e those whose do more than validation # test wrapping)
-AM_LDFLAGS += -static +AM_LDFLAGS = -static
-AM_CFLAGS += $(CUNIT_CFLAGS) +AM_CFLAGS = $(CUNIT_CFLAGS)
LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib
commit 71e078e380f81d972cb82908a8d13dcc155f5cad Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 18:34:08 2017 +0300
build: use AM_CPPFLAGS to set include paths, rather than AM_CFLAGS
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/helper/Makefile.am b/helper/Makefile.am index ca512ff1..fa503f1a 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,13 +2,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc
LIB = $(top_builddir)/lib -AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include -AM_CFLAGS += -I$(top_srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include -AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ -AM_CFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ +AM_CPPFLAGS += -I$(top_builddir)/include
AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)'
diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 00997f10..fdc15f96 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -17,7 +17,7 @@ INCFLAGS = \
ODP_PLATFORM=${with_platform}
-AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS += $(INCFLAGS) AM_LDFLAGS += -static
EXECUTABLES = chksum$(EXEEXT) \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index eada421c..e644505e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,12 +3,12 @@
include $(top_srcdir)/platform/Makefile.inc
-AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CFLAGS += -I$(top_builddir)/include -AM_CFLAGS += -Iinclude -AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -Iinclude +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR)
AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) diff --git a/test/Makefile.inc b/test/Makefile.inc index d701ebd7..f5bb7674 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -15,9 +15,8 @@ INCFLAGS = \ -I$(top_srcdir)/test \ -I$(top_builddir)/include
-AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS += $(CUNIT_CFLAGS) -AM_CXXFLAGS = $(INCFLAGS)
AM_LDFLAGS += -L$(LIB)
commit 3be7ab995e5f2c4472b20008f63299d93a3a806c Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 18:29:24 2017 +0300
build: drop platorm/linux-generic/Makefile.inc
Mandate that platform provides platform/$(with_platform)/arch/$(ARCH_DIR) directory and reference it directly from all Makefile.am/.inc files. Main reason for this change is to allow automake to process all includes at the time of Makefile.am -> Makefile.in conversion. Currently it can not determine path for platform/@with_platform@/Makefile.inc, thus inclusion is left for main make invocation.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/example/Makefile.inc b/example/Makefile.inc index c6d7ff5f..7cc21154 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,4 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) AM_CFLAGS += \ @@ -9,6 +8,7 @@ AM_CFLAGS += \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/helper/include \ -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include
AM_LDFLAGS += -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index c69fd678..ca512ff1 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc
@@ -9,6 +7,7 @@ AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ AM_CFLAGS += -I$(top_builddir)/include
AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index beef9191..00997f10 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc - LIB = $(top_builddir)/lib
#in the following line, the libs using the symbols should come before @@ -13,6 +11,7 @@ INCFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ -I$(top_srcdir)/helper
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8f0618f4..eada421c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -2,13 +2,13 @@ #export CUSTOM_STR=https://git.linaro.org/lng/odp.git
include $(top_srcdir)/platform/Makefile.inc -include $(top_srcdir)/platform/@with_platform@/Makefile.inc
AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude +AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR)
AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) @@ -170,8 +170,7 @@ noinst_HEADERS = \ ${srcdir}/include/protocols/ip.h \ ${srcdir}/include/protocols/ipsec.h \ ${srcdir}/include/protocols/tcp.h \ - ${srcdir}/include/protocols/udp.h \ - ${srcdir}/Makefile.inc + ${srcdir}/include/protocols/udp.h
__LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ diff --git a/platform/linux-generic/Makefile.inc b/platform/linux-generic/Makefile.inc deleted file mode 100644 index 876519be..00000000 --- a/platform/linux-generic/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) -AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) diff --git a/test/Makefile.inc b/test/Makefile.inc index 728868df..d701ebd7 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,4 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib
#in the following line, the libs using the symbols should come before @@ -12,6 +11,7 @@ INCFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_srcdir)/test \ -I$(top_builddir)/include
commit 1882b608abc37314f90bdd2de8ef7f0501a8d5d8 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 18:39:12 2017 +0300
build: drop -Wno-deprecated-declaration
We do not use deprecated attribute anymore, thus let's drop the -Wno-deprecated-declaration flag from compiler options.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 738f0f9a..a88e8384 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -13,9 +13,6 @@ AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' AM_CFLAGS += "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS)
-#The implementation will need to retain the deprecated implementation -AM_CFLAGS += -Wno-deprecated-declarations - AM_CFLAGS += @PTHREAD_CFLAGS@
odpapispecincludedir= $(includedir)/odp/api/spec diff --git a/test/common_plat/validation/api/Makefile.am b/test/common_plat/validation/api/Makefile.am index e2d30a67..601bae6d 100644 --- a/test/common_plat/validation/api/Makefile.am +++ b/test/common_plat/validation/api/Makefile.am @@ -23,6 +23,3 @@ ODP_MODULES = atomic \ system
SUBDIRS = $(ODP_MODULES) - -#The tests will need to retain the deprecated test implementation -AM_CFLAGS += -Wno-deprecated-declarations
commit 863f2ca462a7dd0a17b0828d037d2594767de092 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 18:46:03 2017 +0300
linux-gen: crypto: stop using RAND_pseudo_bytes()
RAND_pseudo_bytes() was deprecated in OpenSSL 1.1.0. It is recommended to use RAND_bytes() instead.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 563e919e..c7da548a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1048,9 +1048,6 @@ int32_t odp_random_data(uint8_t *buf, uint32_t len, odp_random_kind_t kind)
switch (kind) { case ODP_RANDOM_BASIC: - RAND_pseudo_bytes(buf, len); - return len; - case ODP_RANDOM_CRYPTO: rc = RAND_bytes(buf, len); return (1 == rc) ? (int)len /*success*/: -1 /*failure*/;
commit de3ad51a88daa12e9b822e6df339c0e10448d6dd Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 18:24:03 2017 +0300
configure: use ODP_CHECK_FLAG to check for -mcx16
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/configure.ac b/configure.ac index df0a0f61..f6f69942 100644 --- a/configure.ac +++ b/configure.ac @@ -339,16 +339,7 @@ ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" case "${host}" in i?86? | x86*) if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then - my_save_cflags="$CFLAGS" - - CFLAGS=-mcx16 - AC_MSG_CHECKING([whether CC supports -mcx16]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes])] - [ODP_CFLAGS="$ODP_CFLAGS $CFLAGS"], - [AC_MSG_RESULT([no])] - ) - CFLAGS="$my_save_cflags" + ODP_CHECK_CFLAG([-mcx16]) fi ;; esac
commit e7cf0a6c24811d768d4df91d2c03b71676f9f783 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Sep 5 16:29:53 2017 +0300
travis: drop ubuntu-toolchain-r-test PPA
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/.travis.yml b/.travis.yml index a14974c4..5a32ad5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,6 @@ env:
addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - gcc - clang-3.8
-----------------------------------------------------------------------
Summary of changes: .travis.yml | 9 ++--- configure.ac | 23 +++---------- example/Makefile.inc | 6 ++-- helper/Makefile.am | 19 +++++----- helper/test/Makefile.am | 23 ++++++------- platform/Makefile.inc | 7 ++-- platform/linux-generic/Makefile.am | 15 ++++---- platform/linux-generic/Makefile.inc | 2 -- platform/linux-generic/odp_crypto.c | 3 -- test/Makefile.inc | 9 +++-- test/common_plat/common/Makefile.am | 8 ++--- test/common_plat/miscellaneous/Makefile.am | 6 +--- test/common_plat/performance/Makefile.am | 34 +++++------------- test/common_plat/validation/Makefile.am | 2 +- test/common_plat/validation/api/Makefile.am | 3 -- test/common_plat/validation/api/Makefile.inc | 1 - test/common_plat/validation/api/atomic/Makefile.am | 9 ++--- .../common_plat/validation/api/barrier/Makefile.am | 9 ++--- test/common_plat/validation/api/buffer/Makefile.am | 9 ++--- .../validation/api/classification/Makefile.am | 20 +++++------ .../common_plat/validation/api/cpumask/Makefile.am | 10 ++---- test/common_plat/validation/api/crypto/Makefile.am | 16 ++++----- test/common_plat/validation/api/errno/Makefile.am | 9 ++--- test/common_plat/validation/api/hash/Makefile.am | 9 ++--- test/common_plat/validation/api/init/Makefile.am | 16 ++++----- test/common_plat/validation/api/lock/Makefile.am | 9 ++--- test/common_plat/validation/api/packet/Makefile.am | 9 ++--- test/common_plat/validation/api/pktio/Makefile.am | 9 ++--- test/common_plat/validation/api/pool/Makefile.am | 9 ++--- test/common_plat/validation/api/queue/Makefile.am | 9 ++--- test/common_plat/validation/api/random/Makefile.am | 9 ++--- .../validation/api/scheduler/Makefile.am | 9 ++--- test/common_plat/validation/api/shmem/Makefile.am | 9 ++--- .../validation/api/std_clib/Makefile.am | 9 ++--- test/common_plat/validation/api/system/Makefile.am | 9 ++--- test/common_plat/validation/api/thread/Makefile.am | 12 ++----- test/common_plat/validation/api/time/Makefile.am | 8 ++--- test/common_plat/validation/api/timer/Makefile.am | 9 ++--- .../validation/api/traffic_mngr/Makefile.am | 8 ++--- test/linux-generic/Makefile.inc | 4 +-- test/linux-generic/mmap_vlan_ins/Makefile.am | 9 ++--- test/linux-generic/performance/Makefile.am | 2 +- test/linux-generic/pktio_ipc/Makefile.am | 13 ++----- test/linux-generic/pktio_ipc/ipc_common.c | 12 +++---- test/linux-generic/pktio_ipc/ipc_common.h | 2 +- test/linux-generic/pktio_ipc/pktio_ipc1.c | 40 +++++++++++----------- test/linux-generic/pktio_ipc/pktio_ipc2.c | 36 +++++++++---------- test/linux-generic/ring/Makefile.am | 20 +++++------ .../linux-generic/validation/api/shmem/Makefile.am | 15 +++----- test/linux-generic/validation/api/shmem/shmem.h | 21 ------------ 50 files changed, 189 insertions(+), 389 deletions(-) delete mode 100644 platform/linux-generic/Makefile.inc delete mode 100644 test/linux-generic/validation/api/shmem/shmem.h
hooks/post-receive