diff options
| author | Martin Matuska <martin@matuska.org> | 2019-01-30 16:56:37 +0100 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2019-01-30 16:56:37 +0100 |
| commit | d229b1834ee681129c3845c077e41e5d757a1598 (patch) | |
| tree | c9a6de550bc0cf21247cace4b65ff3bf44b0dd3b /build | |
| parent | b5e6eb187549d00c21ae1a259490e81207b51dcb (diff) | |
| download | libarchive-d229b1834ee681129c3845c077e41e5d757a1598.tar.gz | |
Reorganize CI build scripts
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ci/build.sh (renamed from build/ci_build.sh) | 2 | ||||
| -rwxr-xr-x | build/ci/cirrus_ci.sh | 20 | ||||
| -rwxr-xr-x | build/ci/test_driver (renamed from build/ci_test_driver) | 0 |
3 files changed, 14 insertions, 8 deletions
diff --git a/build/ci_build.sh b/build/ci/build.sh index 9449edd4..d61336ea 100755 --- a/build/ci_build.sh +++ b/build/ci/build.sh @@ -94,7 +94,7 @@ for action in ${ACTIONS}; do test) case "${BS}" in autotools) - ${MAKE} ${MAKE_ARGS} check LOG_DRIVER="${SRCDIR}/build/ci_test_driver" + ${MAKE} ${MAKE_ARGS} check LOG_DRIVER="${SRCDIR}/build/ci/test_driver" ;; cmake) ${MAKE} ${MAKE_ARGS} test diff --git a/build/ci/cirrus_ci.sh b/build/ci/cirrus_ci.sh index cb7d42c5..9db762f9 100755 --- a/build/ci/cirrus_ci.sh +++ b/build/ci/cirrus_ci.sh @@ -2,7 +2,7 @@ UNAME=`uname` if [ "$1" = "install" ] then - if [ "$UNAME" = "FreeBSD" ] + if [ "${UNAME}" = "FreeBSD" ] then set -x -e sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf @@ -14,12 +14,12 @@ then mount /dev/$MD /tmp_acl_nfsv4 chmod 1777 /tmp_acl_nfsv4 pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd - elif [ "$UNAME" = "Darwin" ] + elif [ "${UNAME}" = "Darwin" ] then set -x -e brew update brew install autoconf automake libtool pkg-config cmake xz lz4 zstd - elif [ "$UNAME" = "Linux" ] + elif [ "${UNAME}" = "Linux" ] then if [ -f "/etc/debian_version" ] then @@ -32,14 +32,20 @@ then fi elif [ "$1" = "test" ] then - if [ "$UNAME" = "FreeBSD" -a "$BUILD_SYSTEM" != "cmake" ] + if [ "${UNAME}" = "FreeBSD" ] then set -e echo "Additional NFSv4 ACL tests" CURDIR=`pwd` - BUILDDIR="${CURDIR}/build_ci/${BUILD_SYSTEM}" - cd "${BUILDDIR}" - TMPDIR=/tmp_acl_nfsv4 ./libarchive_test -r "${CURDIR}/libarchive/test" -v test_acl_platform_nfs4 + if [ "${BS}" = "cmake" ] + then + BIN_SUBDIR="bin" + else + BIN_SUBDIR=. + fi + BUILDDIR="${CURDIR}/build_ci/${BS}" + cd "$BUILDDIR" + TMPDIR=/tmp_acl_nfsv4 ${BIN_SUBDIR}/libarchive_test -r "${CURDIR}/libarchive/test" -v test_acl_platform_nfs4 fi else echo "Usage $0 install | test_nfsv4_acls" diff --git a/build/ci_test_driver b/build/ci/test_driver index 69a5463c..69a5463c 100755 --- a/build/ci_test_driver +++ b/build/ci/test_driver |