From 8c9361e1d16d3f3577caccbcd39f3854b87ad99e Mon Sep 17 00:00:00 2001
From: "Lucas A. M. Magalhaes" <lamm@linux.ibm.com>
Date: Wed, 5 Aug 2020 12:21:41 -0300
Subject: [PATCH] test: Fix pmempool_sync_remote/TEST21 when SDS is not
supported
Signed-off-by: Lucas A. M. Magalhaes <lamm@linux.ibm.com>
---
src/test/pmempool_sync_remote/TEST21 | 2 ++
src/test/pmempool_sync_remote/common.sh | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/src/test/pmempool_sync_remote/TEST21 b/src/test/pmempool_sync_remote/TEST21
index 4eba6ddcc..16a3fdc55 100755
--- a/src/test/pmempool_sync_remote/TEST21
+++ b/src/test/pmempool_sync_remote/TEST21
@@ -17,6 +17,8 @@ require_sds $PMEMPOOL
configure_poolsets 0 1
+require_sds_support ${NODE_DIR[1]}pool.part.1
+
# XXX: we are using pmemspoil to turn on shutdown state
run_on_node 0 ../pmemspoil ${NODE_DIR[0]}remote.0.part.1 \
diff --git a/src/test/pmempool_sync_remote/common.sh b/src/test/pmempool_sync_remote/common.sh
index 3a0f6a774..df4faef96 100644
--- a/src/test/pmempool_sync_remote/common.sh
+++ b/src/test/pmempool_sync_remote/common.sh
@@ -24,6 +24,16 @@ copy_files_to_node 1 ${NODE_TEST_DIR[1]} $PMEMOBJCLI_SCRIPT
POOLSET_LOCAL="local_pool.set"
+pmempool_exe=$PMEMPOOL$EXESUFFIX
+
+function require_sds_support() {
+ $pmempool_exe feature -q "SHUTDOWN_STATE" $1 2>> /dev/null
+ if [[ $? -eq 0 ]]; then
+ msg "$UNITTEST_NAME: SKIP: SDS is not available"
+ exit 0
+ fi
+}
+
#
# configure_poolsets -- configure pool set files for test
# usage: configure_poolsets <local replicas> <remote replicas>
--
GitLab