diff options
author | Patrick Donnelly <pdonnell@redhat.com> | 2021-01-14 17:09:01 +0100 |
---|---|---|
committer | Patrick Donnelly <pdonnell@redhat.com> | 2021-01-14 17:09:01 +0100 |
commit | 96934109fb2d17bf8dbeff9552ba8937f98b1657 (patch) | |
tree | 4a70d1e587bea7839fb042465c8e7b2e68827b30 /win32_build.sh | |
parent | Merge PR #38574 into master (diff) | |
parent | mds: do not allow the service to run on Windows (diff) | |
download | ceph-96934109fb2d17bf8dbeff9552ba8937f98b1657.tar.xz ceph-96934109fb2d17bf8dbeff9552ba8937f98b1657.zip |
Merge PR #34858 into master
* refs/pull/34858/head:
mds: do not allow the service to run on Windows
win32*.sh: fix SKIP_TESTS flag
include/win32/win32_errno:h Add missing include
client: Port CephFS client to Windows
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'win32_build.sh')
-rwxr-xr-x | win32_build.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/win32_build.sh b/win32_build.sh index 4501f17f176..7f58e4d04f6 100755 --- a/win32_build.sh +++ b/win32_build.sh @@ -158,13 +158,18 @@ 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" make_targets["src/test"]="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" |