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, api-next has been updated via 637353bbd96770741cbb58711c78c9dc01e4ea34 (commit) via 387b402c4f2fc0694b6e0fe68ee4be8a2bd42442 (commit) via ebdf6e27af66a58fff6a17a1c6c2cd6ae85909f1 (commit) via 3edee38da55876e36f654a5d1a4b87c2ea5b8bfe (commit) via 8d22e0e2013596403ae6a35457cdf30b0a0c559b (commit) from cc97d3ae6d6d4c07ec77e7b33e2529154fb0ed24 (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 637353bbd96770741cbb58711c78c9dc01e4ea34 Merge: ebdf6e27 387b402c Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Mon Oct 30 22:27:20 2017 +0300
Merge branch 'master' into api-next
commit ebdf6e27af66a58fff6a17a1c6c2cd6ae85909f1 Author: Matias Elo matias.elo@nokia.com Date: Wed Oct 25 14:59:00 2017 +0300
validation: shmem: compare info page size to all supported huge page sizes
Compare odp_shm_info_t.page_size to all supported page sizes on the system. This enables passing the test when shmem is not allocated using the system's default huge page size.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c index d5335afa..d1abc62b 100644 --- a/test/validation/api/shmem/shmem.c +++ b/test/validation/api/shmem/shmem.c @@ -80,6 +80,7 @@ static int run_test_basic_thread(void *arg ODP_UNUSED) odp_shm_t shm; shared_test_data_t *shared_test_data; int thr; + int pagesz_match = 0;
thr = odp_thread_id(); printf("Thread %i starts\n", thr); @@ -98,8 +99,27 @@ static int run_test_basic_thread(void *arg ODP_UNUSED) CU_ASSERT(0 == info.flags); CU_ASSERT(shared_test_data == info.addr); CU_ASSERT(sizeof(shared_test_data_t) <= info.size); - CU_ASSERT((info.page_size == odp_sys_huge_page_size()) || - (info.page_size == odp_sys_page_size())) + + if (info.page_size == odp_sys_page_size()) { + pagesz_match = 1; + } else { + int num = odp_sys_huge_page_size_all(NULL, 0); + + if (num > 0) { + uint64_t pagesz_tbs[num]; + int i; + + num = odp_sys_huge_page_size_all(pagesz_tbs, num); + for (i = 0; i < num; i++) { + if (info.page_size == pagesz_tbs[i]) { + pagesz_match = 1; + break; + } + } + } + } + CU_ASSERT(pagesz_match == 1); + odp_shm_print_all();
fflush(stdout);
-----------------------------------------------------------------------
Summary of changes: .travis.yml | 1 - doc/users-guide/users-guide.adoc | 18 ++++++++++++++++++ platform/linux-generic/odp_packet.c | 35 +++++++++++++++++++++++++++++++++++ scripts/ci-checkpatches.sh | 22 ++++++++++++++-------- test/validation/api/shmem/shmem.c | 24 ++++++++++++++++++++++-- 5 files changed, 89 insertions(+), 11 deletions(-)
hooks/post-receive