From: Kefu Chai Date: Fri, 25 May 2018 12:06:45 +0000 (+0800) Subject: qa: use $TESTDIR for testing mkfs X-Git-Tag: v13.2.0~16^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce0380e47efb5e20a1b92bf87c3e6b07295317c3;p=ceph.git qa: use $TESTDIR for testing mkfs as tmpfs does not support O_DIRECT, but bluefs use this flag for accessing the underlying file. Signed-off-by: Kefu Chai (cherry picked from commit 1692f49b7b51ca599bf2e180d7a69778a5a5ba68) --- diff --git a/qa/workunits/cephtool/test_kvstore_tool.sh b/qa/workunits/cephtool/test_kvstore_tool.sh index 293e7aa0fbad..34a618e13266 100755 --- a/qa/workunits/cephtool/test_kvstore_tool.sh +++ b/qa/workunits/cephtool/test_kvstore_tool.sh @@ -18,7 +18,8 @@ expect_false() if "$@"; then return 1; else return 0; fi } -TEMP_DIR=$(mktemp -d ${TMPDIR-/tmp}/cephtool.XXX) +TMPDIR=${TMPDIR:-${TESTDIR}} +TEMP_DIR=$(mktemp -d ${TMPDIR:-/tmp}/cephtool.XXX) trap "rm -fr $TEMP_DIR" 0 TEMP_FILE=$(mktemp $TEMP_DIR/test_invalid.XXX)