From 0f06b929c9a1665e88f5b3d1e75444c78c545658 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Wed, 12 Aug 2020 04:56:33 -0400 Subject: [PATCH] test: do not skip check for building cuse/uring/fuse Those modules are now enabled and tested on CI. ABI reference build was updated to include those components. Workarounds for blobfs_bdev can now be removed too. Signed-off-by: Tomasz Zawadzki Change-Id: I4ef321dcb0ce80b13e856a1ca97ed072f7b5ddc4 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3747 Reviewed-by: Karol Latecki Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- test/common/skipped_build_files.txt | 15 --------------- test/make/check_so_deps.sh | 10 +--------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/test/common/skipped_build_files.txt b/test/common/skipped_build_files.txt index d138d62a5..ea794ec82 100644 --- a/test/common/skipped_build_files.txt +++ b/test/common/skipped_build_files.txt @@ -24,21 +24,6 @@ lib/rte_vhost/vhost_user lib/vhost/vhost_nvme lib/virtio/vhost_user -# Cuse related files, enable when ready. -lib/nvme/nvme_cuse -module/bdev/nvme/bdev_nvme_cuse_rpc -test/nvme/cuse/cuse - -# Currently we don't have this plumbed for testing, enable when ready. -module/bdev/uring/bdev_uring -module/bdev/uring/bdev_uring_rpc -module/sock/uring/uring - -# Currently not testing blobfs_fuse, enable when ready. -module/blobfs/bdev/blobfs_fuse -test/blobfs/fuse/fuse - - # These files all represent c files that are only compiled by direct inclusion in other files. test/common/lib/test_env test/common/lib/test_sock diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index e91ded457..c05819a95 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -50,12 +50,6 @@ EOF echo "No corresponding object for $so_file in canonical directory. Skipping." continue fi - if [ "$so_file" == "libspdk_blobfs_bdev.so" ]; then - # FIXME: Disable checking for blobfs_bdev.so. Allows updating ABI reference repo - # without affecting outstanding patches and requiring immediate rebase. - echo "Checking objects for $so_file temporarily disabled. Skipping." - continue - fi if ! output=$(abidiff "$source_abi_dir/$so_file" "$libdir/$so_file" --headers-dir1 "$source_abi_dir/../../include/" --headers-dir2 "$rootdir/include" --leaf-changes-only --suppressions $suppression_file --stat); then # remove any filtered out variables. @@ -251,9 +245,7 @@ echo "---------------------------------------------------------------------" # users can define their own environment abstraction. However we do want to still check it # for dependencies to avoid printing out a bunch of confusing symbols under the missing # symbols section. -# FIXME: Disable checking for blobfs_bdev.so. Allows updating ABI reference repo -# without affecting outstanding patches and requiring immediate rebase. -SPDK_LIBS=$(ls -1 $libdir/libspdk_*.so | grep -v libspdk_env_dpdk.so | grep -v blobfs_bdev.so) +SPDK_LIBS=$(ls -1 $libdir/libspdk_*.so | grep -v libspdk_env_dpdk.so) DEP_LIBS=$(ls -1 $libdir/libspdk_*.so) IGNORED_LIBS=()