RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10306 from tchaikov/wip-no-mktemp-p

Browse Source 
qa/workunits/cephtool/test.sh: s/TMPDIR/TEMP_DIR/

Reviewed-by: Haomai Wang <haomai@xsky.com>
This commit is contained in:
Kefu Chai 2016-07-15 21:34:02 +08:00 committed by GitHub
commit 4025a2eb80
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/workunits/cephtool/test.sh
View File

@ -36,7 +36,7 @@ function expect_false()
TEMP_DIR=$(mktemp -d cephtool.XXX)
trap "rm -fr $TEMP_DIR" 0
TMPFILE=$(mktemp -p $TEMP_DIR test_invalid.XXX)
TMPFILE=$(mktemp $TEMP_DIR/test_invalid.XXX)
#
# retry_eagain max cmd args ...
@ -149,7 +149,7 @@ function ceph_watch_start()
whatch_opt=--watch-$1
fi
CEPH_WATCH_FILE=${TMPDIR}/CEPH_WATCH_$$
CEPH_WATCH_FILE=${TEMP_DIR}/CEPH_WATCH_$$
ceph $whatch_opt > $CEPH_WATCH_FILE &
CEPH_WATCH_PID=$!
@ -1760,7 +1760,7 @@ function test_mon_crushmap_validation()
local map=$TEMP_DIR/map
ceph osd getcrushmap -o $map
local crushtool_path="${TMPDIR}/crushtool"
local crushtool_path="${TEMP_DIR}/crushtool"
touch "${crushtool_path}"
chmod +x "${crushtool_path}"
local crushtool_path_old=`ceph-conf --show-config-value crushtool`

2
src/test/objectstore/run_seed_to_range.sh
View File

@ -12,7 +12,7 @@ mydir=`dirname $0`
for f in `seq $from $to`
do
if ! $mydir/run_seed_to.sh $seed $f; then
if [ -d $dir ]; then
if [ -d "$dir" ]; then
echo copying evidence to $dir
cp -a . $dir
else