From: Martin Matuska <martin@matuska.org>
Date: Wed, 30 Jan 2019 15:56:37 +0000 (+0100)
Subject: Reorganize CI build scripts
X-Git-Tag: v3.4.0~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d229b1834ee681129c3845c077e41e5d757a1598;p=thirdparty%2Flibarchive.git

Reorganize CI build scripts
---

diff --git a/.cirrus.yml b/.cirrus.yml
index a41cf07e6..28d38213f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -22,5 +22,5 @@ task:
   install_script:
     - ./build/ci/cirrus_ci.sh install
   script:
-    - ./build/ci_build.sh
+    - ./build/ci/build.sh
     - ./build/ci/cirrus_ci.sh test
diff --git a/build/ci_build.sh b/build/ci/build.sh
similarity index 97%
rename from build/ci_build.sh
rename to build/ci/build.sh
index 9449edd4a..d61336eaf 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 cb7d42c5b..9db762f97 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
similarity index 100%
rename from build/ci_test_driver
rename to build/ci/test_driver