From e06f9133700ea15e13d5a84871e170651772cbab Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Mon, 19 Mar 2018 16:11:54 +0100 Subject: Disable flock in tests when it's not available --- test/tests/filter-directory-prune-branches.success | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/tests/filter-directory-prune-branches.success') diff --git a/test/tests/filter-directory-prune-branches.success b/test/tests/filter-directory-prune-branches.success index 9d39fec..7bd7c0b 100755 --- a/test/tests/filter-directory-prune-branches.success +++ b/test/tests/filter-directory-prune-branches.success @@ -4,7 +4,7 @@ initializeRepositories -"${BIN_MAIN}" --workdir "${DIR_TEMP}" -- "${DIR_SOURCE}" '--prune-empty --subdirectory-filter subdir' "${DIR_DESTINATION}" +"${BIN_MAIN}" ${BIN_MAIN_OPTIONS} --workdir "${DIR_TEMP}" -- "${DIR_SOURCE}" '--prune-empty --subdirectory-filter subdir' "${DIR_DESTINATION}" echo 'Fetching initial branches' actualBranches="$(getBranchList "${DIR_DESTINATION}")" @@ -15,7 +15,7 @@ then exit 1 fi -"${BIN_MAIN}" --workdir "${DIR_TEMP}" --branch-blacklist 'slave' --prune-branches -- "${DIR_SOURCE}" '--prune-empty --subdirectory-filter subdir' "${DIR_DESTINATION}" +"${BIN_MAIN}" ${BIN_MAIN_OPTIONS} --workdir "${DIR_TEMP}" --branch-blacklist 'slave' --prune-branches -- "${DIR_SOURCE}" '--prune-empty --subdirectory-filter subdir' "${DIR_DESTINATION}" echo 'Fetching final branches' actualBranches="$(getBranchList "${DIR_DESTINATION}")" -- cgit v1.2.3