From 031937d0ff655fd3ead705aed43c4a3c4635bf94 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Mon, 27 Mar 2017 10:41:19 -0700
Subject: [PATCH] test/blobfs/rocksdb: allow alternate location for output

For the automated tests, use this to directly write output
files to the output_dir.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I403f51a4f4d0cac0fca7ec610527bf616f97b20d
---
 test/blobfs/rocksdb/rocksdb.sh   |  3 +--
 test/blobfs/rocksdb/run_tests.sh | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh
index 2ce45ab9b..4e6ee43fc 100755
--- a/test/blobfs/rocksdb/rocksdb.sh
+++ b/test/blobfs/rocksdb/rocksdb.sh
@@ -27,9 +27,8 @@ cp $rootdir/etc/spdk/rocksdb.conf.in $ROCKSDB_CONF
 $rootdir/scripts/gen_nvme.sh >> $ROCKSDB_CONF
 
 $rootdir/test/lib/blobfs/mkfs/mkfs $ROCKSDB_CONF Nvme0n1
-USE_PERF=0 DURATION=30 NUM_KEYS=50000000 ROCKSDB_CONF=$ROCKSDB_CONF CACHE_SIZE=1024 $testdir/run_tests.sh $DB_BENCH
 mkdir $output_dir/rocksdb
-cp $testdir/results/last/* $output_dir/rocksdb
+RESULTS_DIR=$output_dir/rocksdb USE_PERF=0 DURATION=30 NUM_KEYS=50000000 ROCKSDB_CONF=$ROCKSDB_CONF CACHE_SIZE=1024 $testdir/run_tests.sh $DB_BENCH
 
 trap 'rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT
 
diff --git a/test/blobfs/rocksdb/run_tests.sh b/test/blobfs/rocksdb/run_tests.sh
index bdae8a34a..fba0cf56d 100755
--- a/test/blobfs/rocksdb/run_tests.sh
+++ b/test/blobfs/rocksdb/run_tests.sh
@@ -23,14 +23,18 @@ hash python
 ulimit -n 16384
 
 TESTDIR=$(readlink -f $(dirname $0))
-mkdir -p $TESTDIR/results/old
-# if there are any existing test results, move them into the "old" directory
-ls $TESTDIR/results/testrun_* &> /dev/null && mv $TESTDIR/results/testrun_* $TESTDIR/results/old
 
-RESULTS_DIR=$TESTDIR/results/testrun_`date +%Y%m%d_%H%M%S`
-mkdir $RESULTS_DIR
-rm -f $TESTDIR/results/last
-ln -s $RESULTS_DIR $TESTDIR/results/last
+if ls $TESTDIR/results/testrun_* &> /dev/null; then
+	mkdir -p $TESTDIR/results/old
+	mv $TESTDIR/results/testrun_* $TESTDIR/results/old
+fi
+
+if [ -z "$RESULTS_DIR" ]; then
+	RESULTS_DIR=$TESTDIR/results/testrun_`date +%Y%m%d_%H%M%S`
+	mkdir $RESULTS_DIR
+	rm -f $TESTDIR/results/last
+	ln -s $RESULTS_DIR $TESTDIR/results/last
+fi
 
 : ${CACHE_SIZE:=4096}
 : ${DURATION:=120}