From df04be2e5366d77e4b9d5dc4a0c1ecb702eea17b Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Wed, 24 Apr 2019 14:29:45 -0700
Subject: [PATCH] test/rocksdb: move the location of DB_BENCH_DIR

We are switching to a method where we clone the db bench dir in
each build before running tests.
Also update the commit ID to point at the proper place.

Change-Id: I0eeba7bf7118e7da367b1405ae7322668eea3221
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/451984
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/blobfs/rocksdb/rocksdb.sh        | 3 ++-
 test/blobfs/rocksdb/rocksdb_commit_id | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh
index 731625eb3..4d3ea3afc 100755
--- a/test/blobfs/rocksdb/rocksdb.sh
+++ b/test/blobfs/rocksdb/rocksdb.sh
@@ -25,7 +25,8 @@ testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 
-DB_BENCH_DIR=/usr/src/rocksdb
+# In the autotest job, we copy the rocksdb source to just outside the spdk directory.
+DB_BENCH_DIR="$rootdir/../rocksdb"
 DB_BENCH=$DB_BENCH_DIR/db_bench
 ROCKSDB_CONF=$testdir/rocksdb.conf
 
diff --git a/test/blobfs/rocksdb/rocksdb_commit_id b/test/blobfs/rocksdb/rocksdb_commit_id
index 6f0d21645..8f1d0ff52 100644
--- a/test/blobfs/rocksdb/rocksdb_commit_id
+++ b/test/blobfs/rocksdb/rocksdb_commit_id
@@ -1 +1 @@
-3c30815fadf95d029a2dc607660e1d91b3a02ca9
+e32952ef1912f78708abe5e25eeafd43336163d6