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 c4fb7b94edc770c66fd46ba32df586f1a74a3a37 (commit) via 9b88cb5e7f31a9377dcbebfba2e081e2e4f181cd (commit) from 55aa86ea0804385395b16f990956e11660c0d8ab (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 c4fb7b94edc770c66fd46ba32df586f1a74a3a37 Author: Petri Savolainen petri.savolainen@nokia.com Date: Thu May 9 13:22:20 2019 +0300
travis: add out of tree build test
Test ODP build also out of tree.
Signed-off-by: Petri Savolainen petri.savolainen@nokia.com Reviewed-by: Stanislaw Kardach skardach@marvell.com
diff --git a/.travis.yml b/.travis.yml index dec6b25c8..ea26ddedd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -202,6 +202,16 @@ jobs: -e CC="${CC}" -e CONF="--enable-user-guides --disable-abi-compat" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh + - stage: test + env: TEST=out_of_tree + compiler: gcc + script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi + - docker run --privileged -i -t + -v `pwd`:/odp --shm-size 8g + -e CC="${CC}" + -e CONF="" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/out_of_tree.sh - stage: "build only" env: TEST=documentation compiler: gcc diff --git a/scripts/ci/out_of_tree.sh b/scripts/ci/out_of_tree.sh new file mode 100755 index 000000000..d39f55438 --- /dev/null +++ b/scripts/ci/out_of_tree.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +if [ "${CC#clang}" != "${CC}" ] ; then + export CXX="clang++" +fi + +cd "$(dirname "$0")"/../.. +./bootstrap +mkdir tmp && cd tmp +../configure ${CONF} +make -j $(nproc) +
commit 9b88cb5e7f31a9377dcbebfba2e081e2e4f181cd Author: Petri Savolainen petri.savolainen@nokia.com Date: Thu May 9 12:57:06 2019 +0300
helper: fix out-of-tree build
Fix out-of-tree build issue introduced by addition of the new version.h file.
Signed-off-by: Petri Savolainen petri.savolainen@nokia.com Reviewed-by: Stanislaw Kardach skardach@marvell.com
diff --git a/Makefile.inc b/Makefile.inc index f9c4cae4e..421e11361 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -14,6 +14,7 @@ ODP_INCLUDES += \ endif
HELPER_INCLUDES = \ + -I$(top_builddir)/helper/include \ -I$(top_srcdir)/helper/include
LIB = $(top_builddir)/lib diff --git a/configure.ac b/configure.ac index 9b20fcc28..4cd00cc5e 100644 --- a/configure.ac +++ b/configure.ac @@ -378,7 +378,8 @@ AC_CONFIG_FILES([include/Makefile include/odp/api/spec/version.h include/odp/api/spec/deprecated.h])
-AC_CONFIG_FILES([helper/include/odp/helper/version.h]) +AC_CONFIG_FILES([helper/Makefile + helper/include/odp/helper/version.h])
########################################################################## # distribute the changed variables among the Makefiles diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 562bfc6ef..5f6ae0008 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -15,6 +15,5 @@ AC_ARG_ENABLE([helper-linux], [helper_linux=$enableval], [helper_linux=yes])
-AC_CONFIG_FILES([helper/Makefile - helper/libodphelper.pc +AC_CONFIG_FILES([helper/libodphelper.pc helper/test/Makefile])
-----------------------------------------------------------------------
Summary of changes: .travis.yml | 10 ++++++++++ Makefile.inc | 1 + configure.ac | 3 ++- helper/m4/configure.m4 | 3 +-- scripts/ci/out_of_tree.sh | 13 +++++++++++++ 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100755 scripts/ci/out_of_tree.sh
hooks/post-receive