diff options
| author | Martin Matuska <martin@matuska.org> | 2019-05-11 21:36:39 +0200 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2019-05-11 22:08:59 +0200 |
| commit | 34353064114fb10cf8baa2012d3660403ed5eb99 (patch) | |
| tree | f033e197824112733a8cda8d5e13f775ce345102 /build/ci | |
| parent | a9eec9138b69294d9baa91fc019c588c0869b191 (diff) | |
| download | libarchive-34353064114fb10cf8baa2012d3660403ed5eb99.tar.gz | |
CI: increase make command output verbosity
Add Fedora_29_distcheck task with "make distcheck"
Add support for debug build with address sanitizer
Add missing free to tar/test/test_option_C_mtree.c
Diffstat (limited to 'build/ci')
| -rwxr-xr-x | build/ci/build.sh | 19 | ||||
| -rw-r--r-- | build/ci/cirrus_ci/Dockerfile.fc29 (renamed from build/ci/cirrus_ci/Dockerfile.fedora29) | 0 | ||||
| -rw-r--r-- | build/ci/cirrus_ci/Dockerfile.fc29.distcheck | 3 |
3 files changed, 22 insertions, 0 deletions
diff --git a/build/ci/build.sh b/build/ci/build.sh index d61336ea..1b03ac18 100755 --- a/build/ci/build.sh +++ b/build/ci/build.sh @@ -8,11 +8,13 @@ # SRCDIR= # source directory # CONFIGURE_ARGS= # configure arguments # MAKE_ARGS= # make arguments +# DEBUG= # set -g -fsanitize=address flags ACTIONS= if [ -n "${BUILD_SYSTEM}" ]; then BS="${BUILD_SYSTEM}" fi + BS="${BS:-autotools}" MAKE="${MAKE:-make}" CMAKE="${CMAKE:-cmake}" @@ -58,6 +60,23 @@ while getopts a:b:d:s: opt; do ;; esac done +if [ -z "${MAKE_ARGS}" ]; then + if [ "${BS}" = "autotools" ]; then + MAKE_ARGS="V=1" + elif [ "${BS}" = "cmake" ]; then + MAKE_ARGS="VERBOSE=1" + fi +fi +if [ -n "${DEBUG}" ]; then + if [ -n "${CFLAGS}" ]; then + export CFLAGS="${CFLAGS} -g -fsanitize=address" + else + export CFLAGS="-g -fsanitize=address" + fi + if ["${BS}" = "cmake" ]; then + CONFIGURE_ARGS="${CONFIGURE_ARGS} -DCMAKE_C_CFLAGS=-g -fsanitize=address" + fi +fi if [ -z "${ACTIONS}" ]; then ACTIONS="autogen configure build test" fi diff --git a/build/ci/cirrus_ci/Dockerfile.fedora29 b/build/ci/cirrus_ci/Dockerfile.fc29 index d88176b1..d88176b1 100644 --- a/build/ci/cirrus_ci/Dockerfile.fedora29 +++ b/build/ci/cirrus_ci/Dockerfile.fc29 diff --git a/build/ci/cirrus_ci/Dockerfile.fc29.distcheck b/build/ci/cirrus_ci/Dockerfile.fc29.distcheck new file mode 100644 index 00000000..4470b5c3 --- /dev/null +++ b/build/ci/cirrus_ci/Dockerfile.fc29.distcheck @@ -0,0 +1,3 @@ +FROM fedora:29 + +RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript |