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 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb (commit) from 115de92568af53becceae8300fe2f2b6a3436cfc (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 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Wed Feb 14 22:41:18 2018 +0300

example: generator move to platform tests

run generator example with null pktio from linux-generic test directory. Null pktio might not be implemented on other odp implementations.

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org

diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 63f4ae60..7deeef40 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -3,8 +3,3 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_generator

odp_generator_SOURCES = odp_generator.c - -if test_example -TESTS = generator_run.sh -endif -EXTRA_DIST = generator_run.sh diff --git a/example/generator/generator_run.sh b/example/generator/generator_run.sh deleted file mode 100755 index 2d741a8d..00000000 --- a/example/generator/generator_run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2018, Linaro Limited -# All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -./odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u -STATUS=$? - -if [ "$STATUS" -ne 0 ]; then - echo "Error: status was: $STATUS, expected 0" - exit 1 -fi - -exit 0 diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7fa3652e..935894b8 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -19,6 +19,8 @@ AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc platform/linux-generic/test/Makefile + platform/linux-generic/test/example/Makefile + platform/linux-generic/test/example/generator/Makefile platform/linux-generic/test/validation/api/shmem/Makefile platform/linux-generic/test/validation/api/pktio/Makefile platform/linux-generic/test/mmap_vlan_ins/Makefile diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 99934099..e317ff73 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -3,6 +3,10 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation

SUBDIRS = performance

+if test_example +SUBDIRS += example +endif + if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ diff --git a/platform/linux-generic/test/example/Makefile.am b/platform/linux-generic/test/example/Makefile.am new file mode 100644 index 00000000..41d28752 --- /dev/null +++ b/platform/linux-generic/test/example/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = generator diff --git a/platform/linux-generic/test/example/generator/Makefile.am b/platform/linux-generic/test/example/generator/Makefile.am new file mode 100644 index 00000000..3bdfdc69 --- /dev/null +++ b/platform/linux-generic/test/example/generator/Makefile.am @@ -0,0 +1,4 @@ +TESTS_ENVIRONMENT = EXAMPLE_DIR=${top_builddir}/example/generator + +TESTS = generator_run.sh +EXTRA_DIST = generator_run.sh diff --git a/platform/linux-generic/test/example/generator/generator_run.sh b/platform/linux-generic/test/example/generator/generator_run.sh new file mode 100755 index 00000000..3e7fabfe --- /dev/null +++ b/platform/linux-generic/test/example/generator/generator_run.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +# directory where platform test sources are, including scripts +TEST_SRC_DIR=$(dirname $0) + +# exit codes expected by automake for skipped tests +TEST_SKIPPED=77 + +# directories where binary can be found: +# -in the validation dir when running make check (intree or out of tree) +# -in the script directory, when running after 'make install', or +# -in the validation when running standalone intree. +# -in the current directory. +# running stand alone out of tree requires setting PATH +PATH="${EXAMPLE_DIR}/:$PATH" +PATH="`pwd`/example/generator/:$PATH" +PATH="$(dirname $0)/../../../../../example/generator:$PATH" +PATH=".:$PATH" + +bin_path=$(which odp_generator${EXEEXT}) +if [ -x "$bin_path" ] ; then + echo "running with odp_generator: $bin_path" +else + echo "cannot odp_generator: please set you PATH for it." + pwd + echo $PATH + exit 1 +fi + + +odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u +STATUS=$? + +if [ "$STATUS" -ne 0 ]; then + echo "Error: status was: $STATUS, expected 0" + exit 1 +fi + +exit 0

-----------------------------------------------------------------------

Summary of changes: example/generator/Makefile.am | 5 --- example/generator/generator_run.sh | 17 -------- platform/linux-generic/m4/configure.m4 | 2 + platform/linux-generic/test/Makefile.am | 4 ++ platform/linux-generic/test/example/Makefile.am | 1 + .../test/example/generator/Makefile.am | 4 ++ .../test/example/generator/generator_run.sh | 45 ++++++++++++++++++++++ 7 files changed, 56 insertions(+), 22 deletions(-) delete mode 100755 example/generator/generator_run.sh create mode 100644 platform/linux-generic/test/example/Makefile.am create mode 100644 platform/linux-generic/test/example/generator/Makefile.am create mode 100755 platform/linux-generic/test/example/generator/generator_run.sh

hooks/post-receive