]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
win32*.sh: fix SKIP_TESTS flag
authorLucian Petrut <lpetrut@cloudbasesolutions.com>
Wed, 13 Jan 2021 09:57:12 +0000 (09:57 +0000)
committerLucian Petrut <lpetrut@cloudbasesolutions.com>
Wed, 13 Jan 2021 10:38:33 +0000 (10:38 +0000)
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>
win32_build.sh

index 4a620f60a8ad13b13439ced83c7c001800868cec..598e2d488baa5f39b4955985bd3409b56bff9c09 100755 (executable)
@@ -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"