From 654aa4b975405e19e9de020db0c5f9b418a46abc Mon Sep 17 00:00:00 2001
From: Karol Latecki <karol.latecki@intel.com>
Date: Fri, 10 Dec 2021 11:20:19 +0100
Subject: [PATCH] test/blobfs: update rocksdb version

Use one of the recent branches for rocksdb. This allows
to build with less -Wno-error options. Adjust C flags
for more recent GCC versions.

Change-Id: Icf176d909a92195da2ae744a53e0cb53530b4573
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10628
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Michal Berger <michalx.berger@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 test/blobfs/rocksdb/rocksdb.sh        | 4 +++-
 test/blobfs/rocksdb/rocksdb_commit_id | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh
index f334165f5..b23864e5f 100755
--- a/test/blobfs/rocksdb/rocksdb.sh
+++ b/test/blobfs/rocksdb/rocksdb.sh
@@ -66,8 +66,10 @@ fi
 
 EXTRA_CXXFLAGS=""
 GCC_VERSION=$(cc -dumpversion | cut -d. -f1)
-if ((GCC_VERSION >= 9)); then
+if ((GCC_VERSION >= 9)) && ((GCC_VERSION < 11)); then
 	EXTRA_CXXFLAGS+="-Wno-deprecated-copy -Wno-pessimizing-move -Wno-error=stringop-truncation"
+elif ((GCC_VERSION >= 11)); then
+	EXTRA_CXXFLAGS+="-Wno-error=range-loop-construct"
 fi
 
 $MAKE db_bench $MAKEFLAGS $MAKECONFIG DEBUG_LEVEL=0 SPDK_DIR=../spdk EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS"
diff --git a/test/blobfs/rocksdb/rocksdb_commit_id b/test/blobfs/rocksdb/rocksdb_commit_id
index efac5a55d..ea0c6cf53 100644
--- a/test/blobfs/rocksdb/rocksdb_commit_id
+++ b/test/blobfs/rocksdb/rocksdb_commit_id
@@ -1 +1 @@
-526c73bd94150cc8fbd651f736e1ca95f50d8e13
+1f80f5b2c74353608614157992f5c3915d972d75