diff options
| -rw-r--r-- | .cirrus.yml | 14 | ||||
| -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 | ||||
| -rw-r--r-- | tar/test/test_option_C_mtree.c | 1 |
5 files changed, 36 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ae72919a..456869e2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -48,7 +48,7 @@ MacOS_task: Fedora_29_task: container: - dockerfile: build/ci/cirrus_ci/Dockerfile.fedora29 + dockerfile: build/ci/cirrus_ci/Dockerfile.fc29 matrix: env: BS: autotools @@ -62,6 +62,18 @@ Fedora_29_task: test_script: - ./build/ci/build.sh -a test +Fedora_29_distcheck_task: + container: + dockerfile: build/ci/cirrus_ci/Dockerfile.fc29.distcheck + env: + BS: autotools + MAKE_ARGS: distcheck + configure_script: + - ./build/ci/build.sh -a autogen + - ./build/ci/build.sh -a configure + build_script: + - ./build/ci/build.sh -a build + Windows_MSVC_task: windows_container: dockerfile: build/ci/cirrus_ci/Dockerfile.msvc 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 diff --git a/tar/test/test_option_C_mtree.c b/tar/test/test_option_C_mtree.c index f0903066..ccadc389 100644 --- a/tar/test/test_option_C_mtree.c +++ b/tar/test/test_option_C_mtree.c @@ -83,6 +83,7 @@ DEFINE_TEST(test_option_C_mtree) assertEqualMem(p0 + 1536, "\0\0\0\0\0\0\0\0", 8); done: free(p0); + free(absolute_path); } |