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 120e914768f731f18083afd950fba6a6793cca45 (commit) via de32602f12e563b2d5ff10b786c6fd506e74776f (commit) via 8a939edfa992620cf7a5cb495ce44dbc15c709c6 (commit) via 40a2663668ce995e4b6b410ca0d3bf3578d02a67 (commit) via 03203ea8b1c3d142b41f5c332527f20ed29c3040 (commit) via 60105f079350405920462a4b0d59c7e78d9a8492 (commit) via 6e02ad50626de86804cbd62ae467104ae7850220 (commit) via da905ec07e1e50b4d34975a81ea289ec96eba503 (commit) via 29139f725a7d6f2bd9e57a60abf1e55f4ac64c97 (commit) from 7508c5ac906bb7cb1d339b4c5e924f3a18e504ca (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 120e914768f731f18083afd950fba6a6793cca45 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Wed Aug 30 18:19:24 2017 +0300
configure, travis: switch to pkg-config to locate CUnit
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 45ffa396..a14974c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,6 +108,7 @@ before_install: sudo make install popd fi + - export PKG_CONFIG_PATH="$HOME/cunit-install/$CROSS_ARCH/lib/pkgconfig:${PKG_CONFIG_PATH}" - find $HOME/cunit-install
install: @@ -154,7 +155,7 @@ script: --enable-user-guides --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF + $CONF --enable-debug=full --enable-helper-linux - make -j $(nproc) @@ -165,10 +166,10 @@ script: - echo "Checking linking and run from install..." - pushd $HOME - echo "Dynamic link.." - - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig pkg-config --cflags --libs libodp-linux` + - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux` - LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst - echo "Static link.." - - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig pkg-config --cflags --libs libodp-linux --static` -static + - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static - ./odp_hello_inst - ccache -s
@@ -184,7 +185,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: ""clang-3.8 --target=aarch64-linux-gnu"" @@ -196,7 +196,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: arm-linux-gnueabihf-gcc @@ -208,7 +207,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: ""clang-3.8 --target=arm-linux-gnueabihf"" @@ -220,7 +218,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: powerpc-linux-gnu-gcc @@ -232,7 +229,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: ""clang-3.8 --target=powerpc-linux-gnu"" @@ -244,7 +240,6 @@ jobs: --enable-debug=full --disable-test-cpp --enable-helper-linux - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test env: TEST=coverage @@ -256,7 +251,6 @@ jobs: --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full --enable-helper-linux @@ -269,8 +263,7 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-user-guides - --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-cunit-path=$HOME/cunit-install/$CROSS_ARCH" + - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck - stage: test env: TEST=doxygen compiler: gcc diff --git a/test/Makefile.inc b/test/Makefile.inc index 0fbc3c42..728868df 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -16,7 +16,7 @@ INCFLAGS = \ -I$(top_builddir)/include
AM_CFLAGS += $(INCFLAGS) -AM_CPPFLAGS += $(CUNIT_CPPFLAGS) +AM_CFLAGS += $(CUNIT_CFLAGS) AM_CXXFLAGS = $(INCFLAGS)
AM_LDFLAGS += -L$(LIB) diff --git a/test/common_plat/m4/validation.m4 b/test/common_plat/m4/validation.m4 index b2a2f75d..e303f8f2 100644 --- a/test/common_plat/m4/validation.m4 +++ b/test/common_plat/m4/validation.m4 @@ -8,43 +8,11 @@ AC_ARG_ENABLE([test_vald], AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ])
########################################################################## -# Set optional CUnit path -########################################################################## -cunit_support=$test_vald -AC_ARG_WITH([cunit-path], -AC_HELP_STRING([--with-cunit-path=DIR], - [path to CUnit libs and headers (if not present at default path)]), - [CUNIT_PATH=$withval - CUNIT_CPPFLAGS="-I$CUNIT_PATH/include" - CUNIT_LIBS="-L$CUNIT_PATH/lib" - cunit_support=yes],[]) - -########################################################################## -# Save and set temporary compilation flags -########################################################################## -OLD_LIBS=$LIBS -OLD_CPPFLAGS=$CPPFLAGS -LIBS="$CUNIT_LIBS $LIBS" -CPPFLAGS="$CUNIT_CPPFLAGS $CPPFLAGS" - -########################################################################## # Check for CUnit availability ########################################################################## -if test x$cunit_support = xyes -then - AC_CHECK_LIB([cunit],[CU_get_error], [CUNIT_LIBS="$CUNIT_LIBS -lcunit"], - [AC_MSG_ERROR([CUnit libraries required])]) - AC_CHECK_HEADERS([CUnit/Basic.h], [], - [AC_MSG_FAILURE(["can't find cunit headers"])]) -else - cunit_support=no -fi +cunit_support=$test_vald +AS_IF([test "x$cunit_support" = "xyes"], + [PKG_CHECK_MODULES([CUNIT], [cunit])])
-AC_SUBST([CUNIT_CPPFLAGS]) +AC_SUBST([CUNIT_CFLAGS]) AC_SUBST([CUNIT_LIBS]) - -########################################################################## -# Restore old saved variables -########################################################################## -LIBS=$OLD_LIBS -CPPFLAGS=$OLD_CPPFLAGS diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index 767526ed..a9448b17 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -6,7 +6,7 @@ AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common AM_LDFLAGS += -static AM_LDFLAGS += $(DPDK_PMDS)
-AM_CPPFLAGS += $(CUNIT_CPPFLAGS) +AM_CFLAGS += $(CUNIT_PFLAGS)
LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index 30b56e26..ff99fbc9 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -4,7 +4,7 @@
AM_LDFLAGS += -static
-AM_CPPFLAGS += $(CUNIT_CPPFLAGS) +AM_CFLAGS += $(CUNIT_CFLAGS)
LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib
commit de32602f12e563b2d5ff10b786c6fd506e74776f Author: Bill Fischofer bill.fischofer@linaro.org Date: Tue Aug 29 13:53:28 2017 -0500
travis: add --enable-helper-linux test variants
The ODP helper modules can explicitly expose linux variants via the --enable-helper-linux configuration option, so add that into the test options as well to ensure full coverage.
[DES: just enable this option instead of adding another entry into build matrix.]
Signed-off-by: Bill Fischofer bill.fischofer@linaro.org 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 05cddbc3..45ffa396 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,6 +156,7 @@ script: --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF --enable-debug=full + --enable-helper-linux - make -j $(nproc) - mkdir /dev/shm/odp - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check @@ -182,6 +183,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -193,6 +195,7 @@ jobs: - ./configure --prefix=$HOME/odp/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -204,6 +207,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -215,6 +219,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -226,6 +231,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -237,6 +243,7 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full --disable-test-cpp + --enable-helper-linux --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -252,6 +259,7 @@ jobs: --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full + --enable-helper-linux - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:./node_modules/.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} ; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test
commit 8a939edfa992620cf7a5cb495ce44dbc15c709c6 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Wed Aug 30 15:05:49 2017 +0300
travis: enable full debug option
The --enable-debug=full option allows expansion of ODP_DBG() and ODPH_DBG() debugging statements throughout ODP. Add this option to .travis.yml to ensure that these are properly tested as part of regressions.
Cc: Bill Fischofer bill.fischofer@linaro.org 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 bd2e3e32..05cddbc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,7 +155,7 @@ script: --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF - --enable-debug + --enable-debug=full - make -j $(nproc) - mkdir /dev/shm/odp - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check @@ -180,7 +180,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -191,7 +191,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -202,7 +202,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -213,7 +213,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -224,7 +224,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -235,7 +235,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --enable-debug + --enable-debug=full --disable-test-cpp --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) @@ -251,7 +251,7 @@ jobs: -coverage" --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" - --enable-debug + --enable-debug=full - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:./node_modules/.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} ; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test
commit 40a2663668ce995e4b6b410ca0d3bf3578d02a67 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Wed Aug 30 15:03:02 2017 +0300
travis: drop configure options enabled by default
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 478d4200..bd2e3e32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,13 +151,7 @@ install: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install - --enable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf --enable-user-guides - --enable-test-perf-proc - --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF @@ -188,11 +182,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -204,11 +193,6 @@ jobs: - ./configure --prefix=$HOME/odp/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -220,11 +204,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -236,11 +215,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -252,11 +226,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -268,11 +237,6 @@ jobs: - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug --disable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test @@ -281,13 +245,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install - --enable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf --enable-user-guides - --enable-test-perf-proc - --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" @@ -302,13 +260,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install - --enable-test-cpp - --enable-test-vald - --enable-test-helper - --enable-test-perf --enable-user-guides - --enable-test-perf-proc - --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-cunit-path=$HOME/cunit-install/$CROSS_ARCH" - stage: test
commit 03203ea8b1c3d142b41f5c332527f20ed29c3040 Author: Bill Fischofer bill.fischofer@linaro.org Date: Mon Aug 28 16:50:22 2017 -0500
travis: split configure commands into individual options
Avoid long configure command lines by splitting it into individual lines for each option. This permits easy future option maintenance without running into checkpatch line length checks.
Signed-off-by: Bill Fischofer bill.fischofer@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 245ade2a..478d4200 100644 --- a/.travis.yml +++ b/.travis.yml @@ -150,7 +150,17 @@ install:
script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF + - ./configure --prefix=$HOME/odp-install + --enable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-user-guides + --enable-test-perf-proc + --enable-test-example + --with-dpdk-path=`pwd`/dpdk/${TARGET} + --with-netmap-path=`pwd`/netmap + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF --enable-debug - make -j $(nproc) - mkdir /dev/shm/odp @@ -175,8 +185,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: ""clang-3.8 --target=aarch64-linux-gnu"" @@ -184,8 +201,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: arm-linux-gnueabihf-gcc @@ -193,8 +217,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: ""clang-3.8 --target=arm-linux-gnueabihf"" @@ -202,8 +233,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: powerpc-linux-gnu-gcc @@ -211,8 +249,15 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: ""clang-3.8 --target=powerpc-linux-gnu"" @@ -220,15 +265,34 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install $CROSS + --enable-debug + --disable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test env: TEST=coverage compiler: gcc script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" + - ./configure --prefix=$HOME/odp-install + --enable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-user-guides + --enable-test-perf-proc + --enable-test-example + --with-dpdk-path=`pwd`/dpdk/${TARGET} + --with-netmap-path=`pwd`/netmap CFLAGS="-O0 + -coverage" + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:./node_modules/.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} ; ; bash <(curl -s https://codecov.io/bash) -X coveragepy @@ -237,7 +301,15 @@ jobs: compiler: gcc script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - ./configure --prefix=$HOME/odp-install + --enable-test-cpp + --enable-test-vald + --enable-test-helper + --enable-test-perf + --enable-user-guides + --enable-test-perf-proc + --enable-test-example + --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-cunit-path=$HOME/cunit-install/$CROSS_ARCH" - stage: test env: TEST=doxygen
commit 60105f079350405920462a4b0d59c7e78d9a8492 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Wed Aug 30 14:44:02 2017 +0300
configure: provide a way to enable all debugging options at once
Adding --enable-debug=full to configure will enable all debugging 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/configure.ac b/configure.ac index dcf14629..df0a0f61 100644 --- a/configure.ac +++ b/configure.ac @@ -239,39 +239,40 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, ${builddir}/doc/driver-api-guide/output)
########################################################################## +# Enable/disable ODP_DEBUG +########################################################################## +AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], + [include additional debugging code ] + [(set to 'full' to enable all --enable-*-debug-* options)])]) + +AS_IF([test "x$enable_debug" != "xno"], [ODP_DEBUG=1], + [ODP_DEBUG=0]) +AC_DEFINE_UNQUOTED([ODP_DEBUG], [$ODP_DEBUG], + [Define to 1 to include additional debug code]) + +########################################################################## # Enable/disable ODP_DEBUG_PRINT ########################################################################## -ODP_DEBUG_PRINT=0 AC_ARG_ENABLE([debug-print], - [ --enable-debug-print display debugging information], - [if test "x$enableval" = "xyes"; then - ODP_DEBUG_PRINT=1 - fi]) + [AS_HELP_STRING([--enable-debug-print], [display debugging information])], + [], [AS_IF([test "x$enable_debug" = "xfull"], [enable_debug_print=yes], + [enable_debug_print=no])]) +AS_IF([test "x$enable_debug_print" != "xno"], [ODP_DEBUG_PRINT=1], + [ODP_DEBUG_PRINT=0]) AC_DEFINE_UNQUOTED([ODP_DEBUG_PRINT], [$ODP_DEBUG_PRINT], [Define to 1 to display debug information])
-ODPH_DEBUG_PRINT=0 AC_ARG_ENABLE([helper-debug-print], - [ --enable-helper-debug-print display helper debugging information], - [if test "x$enableval" = "xyes"; then - ODPH_DEBUG_PRINT=1 - fi]) + [AS_HELP_STRING([--enable-helper-debug-print], [display helper debugging information])], + [], [AS_IF([test "x$enable_debug" = "xfull"], [enable_helper_debug_print=yes], + [enable_helper_debug_print=no])]) +AS_IF([test "x$enable_helper_debug_print" != "xno"], [ODPH_DEBUG_PRINT=1], + [ODPH_DEBUG_PRINT=0]) AC_DEFINE_UNQUOTED([ODPH_DEBUG_PRINT], [$ODPH_DEBUG_PRINT], [Define to 1 to display helper debug information])
########################################################################## -# Enable/disable ODP_DEBUG -########################################################################## -ODP_DEBUG=0 -AC_ARG_ENABLE([debug], - [ --enable-debug include additional code], - [if test "x$enableval" = "xyes"; then - ODP_DEBUG=1 - fi]) -AC_DEFINE_UNQUOTED([ODP_DEBUG], [$ODP_DEBUG], - [Define to 1 to include additional debug code]) - -########################################################################## # Enable/disable ABI compatible build ########################################################################## ODP_ABI_COMPAT=1
commit 6e02ad50626de86804cbd62ae467104ae7850220 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Wed Aug 30 14:27:49 2017 +0300
configure: enable helper-linux in distcheck 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/Makefile.am b/Makefile.am index 7398499c..6c43679e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ ACLOCAL_AMFLAGS=-I m4 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ + --enable-helper-linux \ --with-testdir
#@with_platform@ works alone in subdir but not as part of a path???
commit da905ec07e1e50b4d34975a81ea289ec96eba503 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Wed Aug 30 14:26:52 2017 +0300
configure: rework with-testdir check
Rework with-testdir option handling to follow the rest of configure 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/configure.ac b/configure.ac index c076b4cc..dcf14629 100644 --- a/configure.ac +++ b/configure.ac @@ -200,19 +200,18 @@ AC_SUBST(SDK_INSTALL_PATH) # Set the install directory for test binaries/scripts ########################################################################## AC_ARG_WITH([testdir], - AC_HELP_STRING([--with-testdir=DIR installation directory for tests]), - [if test "$withval" = "yes"; then - testdir=$libdir/odp/tests - else - testdir=$withval - fi], []) + [AC_HELP_STRING([--with-testdir=DIR], [installation directory for tests])], + [testdir=$withval], + [testdir=no]) +AS_IF([test "x$testdir" = "xyes"], [testdir=$libdir/odp/tests], + [test "x$testdir" = "xno"], [testdir=]) AC_SUBST([testdir]) +AM_CONDITIONAL([test_installdir], [test "x$testdir" != "xno"])
########################################################################## # Set conditionals as computed within platform specific files ########################################################################## AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) -AM_CONDITIONAL([test_installdir], [test "$testdir" != ""]) AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ])
commit 29139f725a7d6f2bd9e57a60abf1e55f4ac64c97 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Aug 29 16:22:17 2017 +0300
configure: enable all tests by default
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/Makefile.am b/Makefile.am index e1ea07d5..7398499c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,5 @@ ACLOCAL_AMFLAGS=-I m4 -AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \ - --enable-test-example \ - --enable-test-helper \ - --enable-test-perf \ - --enable-test-perf-proc \ - --enable-test-vald \ - --enable-user-guides \ +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ --with-testdir
#@with_platform@ works alone in subdir but not as part of a path??? diff --git a/configure.ac b/configure.ac index c1811003..c076b4cc 100644 --- a/configure.ac +++ b/configure.ac @@ -214,12 +214,6 @@ AC_SUBST([testdir]) AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) AM_CONDITIONAL([test_installdir], [test "$testdir" != ""]) AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ]) -AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) -AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) -AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ]) -AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ]) -AM_CONDITIONAL([test_helper], [test x$test_helper = xyes ]) -AM_CONDITIONAL([test_example], [test x$test_example = xyes ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) diff --git a/example/m4/configure.m4 b/example/m4/configure.m4 index 18218d05..cab7f8b8 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -1,14 +1,11 @@ ########################################################################## # Enable/disable test-example ########################################################################## -test_example=no AC_ARG_ENABLE([test-example], - [ --enable-test-example run basic test against examples], - [if test "x$enableval" = "xyes"; then - test_example=yes - else - test_example=no - fi]) + [AS_HELP_STRING([--enable-test-example], [run basic test against examples])], + [test_example=$enableval], + [test_example=yes]) +AM_CONDITIONAL([test_example], [test x$test_example = xyes ])
AC_CONFIG_FILES([example/classifier/Makefile example/generator/Makefile diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 343f5e3c..2e2943d1 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -1,12 +1,11 @@ ########################################################################## # Enable/disable test-helper ########################################################################## -test_helper=no AC_ARG_ENABLE([test-helper], - [ --enable-test-helper run test in helper/test], - [if test "x$enableval" = "xyes"; then - test_helper=yes - fi]) + [AS_HELP_STRING([--enable-test-helper], [run test in helper/test])], + [test_helper=$enableval], + [test_helper=yes]) +AM_CONDITIONAL([test_helper], [test x$test_helper = xyes ])
########################################################################## # Enable/disable helper-ext diff --git a/test/common_plat/m4/miscellaneous.m4 b/test/common_plat/m4/miscellaneous.m4 index cc881edb..dac236a6 100644 --- a/test/common_plat/m4/miscellaneous.m4 +++ b/test/common_plat/m4/miscellaneous.m4 @@ -1,9 +1,8 @@ ########################################################################## # Enable/disable test-cpp ########################################################################## -test_cpp=no AC_ARG_ENABLE([test-cpp], - [ --enable-test-cpp run basic test aginast cpp], - [if test "x$enableval" = "xyes"; then - test_cpp=yes - fi]) + [AS_HELP_STRING([--disable-test-cpp], [run basic test aginast cpp])], + [test_cpp=$enableval], + [test_cpp=yes]) +AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ]) diff --git a/test/common_plat/m4/performance.m4 b/test/common_plat/m4/performance.m4 index 1e2000d9..34270e8d 100644 --- a/test/common_plat/m4/performance.m4 +++ b/test/common_plat/m4/performance.m4 @@ -1,9 +1,8 @@ ########################################################################## # Enable/disable test-perf ########################################################################## -test_perf=no AC_ARG_ENABLE([test-perf], - [ --enable-test-perf run test in test/performance], - [if test "x$enableval" = "xyes"; then - test_perf=yes - fi]) + [AS_HELP_STRING([--enable-test-perf], [run test in test/performance])], + [test_perf=$enableval], + [test_perf=yes]) +AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) diff --git a/test/common_plat/m4/validation.m4 b/test/common_plat/m4/validation.m4 index 67edac7a..b2a2f75d 100644 --- a/test/common_plat/m4/validation.m4 +++ b/test/common_plat/m4/validation.m4 @@ -1,30 +1,19 @@ ########################################################################## # Enable/disable Unit tests ########################################################################## -cunit_support=no -test_vald=no AC_ARG_ENABLE([test_vald], - [ --enable-test-vald run test in test/validation], - [if test x$enableval = xyes; then - test_vald=yes - cunit_support=yes - fi]) - -########################################################################## -# Enable/disable Unit tests -########################################################################## -AC_ARG_ENABLE([cunit_support], - [ --enable-cunit-support include cunit infrastructure], - [if test x$enableval = xyes; then - cunit_support=yes - fi]) + [AS_HELP_STRING([--enable-test-vald], [run test in test/validation])], + [test_vald=$enableval], + [test_vald=yes]) +AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ])
########################################################################## # Set optional CUnit path ########################################################################## +cunit_support=$test_vald AC_ARG_WITH([cunit-path], -AC_HELP_STRING([--with-cunit-path=DIR path to CUnit libs and headers], - [(or in the default path if not specified).]), +AC_HELP_STRING([--with-cunit-path=DIR], + [path to CUnit libs and headers (if not present at default path)]), [CUNIT_PATH=$withval CUNIT_CPPFLAGS="-I$CUNIT_PATH/include" CUNIT_LIBS="-L$CUNIT_PATH/lib" diff --git a/test/linux-generic/m4/performance.m4 b/test/linux-generic/m4/performance.m4 index 7f54b96d..05b3a990 100644 --- a/test/linux-generic/m4/performance.m4 +++ b/test/linux-generic/m4/performance.m4 @@ -1,9 +1,8 @@ ########################################################################## # Enable/disable test-perf-proc ########################################################################## -test_perf_proc=no AC_ARG_ENABLE([test-perf-proc], - [ --enable-test-perf-proc run test in test/performance in process mode], - [if test "x$enableval" = "xyes"; then - test_perf_proc=yes - fi]) + [AS_HELP_STRING([--enable-test-perf-proc], [run test in test/performance in process mode])], + [test_perf_proc=$enableval], + [test_perf_proc=yes]) +AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ])
-----------------------------------------------------------------------
Summary of changes: .travis.yml | 65 +++++++++++++++++++--------- Makefile.am | 9 +--- configure.ac | 64 +++++++++++++-------------- example/m4/configure.m4 | 11 ++--- helper/m4/configure.m4 | 9 ++-- test/Makefile.inc | 2 +- test/common_plat/m4/miscellaneous.m4 | 9 ++-- test/common_plat/m4/performance.m4 | 9 ++-- test/common_plat/m4/validation.m4 | 59 ++++--------------------- test/common_plat/validation/api/Makefile.inc | 2 +- test/linux-generic/Makefile.inc | 2 +- test/linux-generic/m4/performance.m4 | 9 ++-- 12 files changed, 107 insertions(+), 143 deletions(-)
hooks/post-receive