summaryrefslogtreecommitdiffstats
path: root/win32_build.sh
diff options
context:
space:
mode:
authorLucian Petrut <lpetrut@cloudbasesolutions.com>2021-01-13 10:57:12 +0100
committerLucian Petrut <lpetrut@cloudbasesolutions.com>2021-01-13 11:38:33 +0100
commita9b322b385ab57d7b4d9a4ead22885611be1b019 (patch)
treed0a94f9fccfd6becae425724b0d245b1a58f7f97 /win32_build.sh
parentinclude/win32/win32_errno:h Add missing include (diff)
downloadceph-a9b322b385ab57d7b4d9a4ead22885611be1b019.tar.xz
ceph-a9b322b385ab57d7b4d9a4ead22885611be1b019.zip
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 <lpetrut@cloudbasesolutions.com>
Diffstat (limited to 'win32_build.sh')
-rwxr-xr-xwin32_build.sh7
1 files changed, 6 insertions, 1 deletions
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"