From 3f5e32adca6073f67742a7b32bacf9f7bf979663 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 23 Apr 2019 07:00:26 -0700 Subject: [PATCH] test/rocksdb: add rocksdb_commit_id file This signals which RocksDB commit should be checked out for the SPDK RocksDB tests. Also point the rocksdb.sh test script to point to where this version of RocksDB will be cloned. (Note: this is a modified version of what was merged to master.) Signed-off-by: Jim Harris Change-Id: I1ba0be00747a2642b359b1e0e0c8c2c6d99cc4f0 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/451772 (master) Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452482 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker --- test/blobfs/rocksdb/rocksdb.sh | 3 ++- test/blobfs/rocksdb/rocksdb_commit_id | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 test/blobfs/rocksdb/rocksdb_commit_id diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh index 2e3c4d0f15..5a99f5772c 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -30,7 +30,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 new file mode 100644 index 0000000000..efac5a55d2 --- /dev/null +++ b/test/blobfs/rocksdb/rocksdb_commit_id @@ -0,0 +1 @@ +526c73bd94150cc8fbd651f736e1ca95f50d8e13