From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 14 Jan 2021 16:09:01 +0000 (-0800)
Subject: Merge PR #34858 into master
X-Git-Tag: v16.1.0~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96934109fb2d17bf8dbeff9552ba8937f98b1657;p=ceph.git

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>
---

96934109fb2d17bf8dbeff9552ba8937f98b1657
diff --cc win32_build.sh
index 4501f17f1766,598e2d488baa..7f58e4d04f60
--- a/win32_build.sh
+++ b/win32_build.sh
@@@ -163,8 -160,12 +163,13 @@@ if [[ -z $SKIP_BUILD ]]; the
      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"