]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #34858 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 14 Jan 2021 16:09:01 +0000 (08:09 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 14 Jan 2021 16:09:01 +0000 (08:09 -0800)
* 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>
1  2 
src/mds/mdstypes.h
win32_build.sh

Simple merge
diff --cc win32_build.sh
index 4501f17f1766e6dfe62c0536b3d0e3d3687a0570,598e2d488baa5f39b4955985bd3409b56bff9c09..7f58e4d04f608b9b86f6efcafaeae91902d279d7
@@@ -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"