From a9b322b385ab57d7b4d9a4ead22885611be1b019 Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Wed, 13 Jan 2021 09:57:12 +0000 Subject: win32*.sh: fix SKIP_TESTS flag The "SKIP_TESTS" flag used by the Windows build script is currently ignored. This patch will skip some of the make targets when "SKIP_TESTS" is set. Signed-off-by: Lucian Petrut --- win32_build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'win32_build.sh') diff --git a/win32_build.sh b/win32_build.sh index 4a620f60a8a..598e2d488ba 100755 --- a/win32_build.sh +++ b/win32_build.sh @@ -155,12 +155,17 @@ if [[ -z $SKIP_BUILD ]]; then # We're going to use an associative array having subdirectories as keys # and targets as values. declare -A make_targets - make_targets["src/tools"]="ceph-conf ceph_radosacl ceph_scratchtool rados" + make_targets["src/tools"]="ceph-conf rados" make_targets["src/tools/immutable_object_cache"]="all" make_targets["src/tools/rbd"]="all" make_targets["src/tools/rbd_wnbd"]="all" make_targets["src/compressor"]="all" + if [[ -z $SKIP_TESTS ]]; then + make_targets["src/tools"]+=" ceph_radosacl ceph_scratchtool" + make_targets["src/test"]="all" + fi + for target_subdir in "${!make_targets[@]}"; do echo "Building $target_subdir: ${make_targets[$target_subdir]}" | tee -a "${BUILD_DIR}/build.log" make -j $NUM_WORKERS -C $target_subdir ${make_targets[$target_subdir]} 2>&1 | tee -a "${BUILD_DIR}/build.log" -- cgit v1.2.3