mirror of https://github.com/vitalif/e2fsprogs
tests: avoid using mktemp -t
The -t option is documented as deprecated in GNU's mktemp, and FreeBSD's mktemp doesn't support it at all. Replace it with the construct "mktemp ${TMPDIR:-/tmp}/foo.XXXXXX" Signed-off-by: Theodore Ts'o <tytso@mit.edu>maint-test
parent
0b5610e0fa
commit
bdeb2dba29
|
@ -23,7 +23,7 @@ VOLUME=root
|
||||||
SNAPSIZE=100m
|
SNAPSIZE=100m
|
||||||
EMAIL=sysadmin@example.com
|
EMAIL=sysadmin@example.com
|
||||||
|
|
||||||
TMPFILE=`mktemp -t e2fsck.log.XXXXXXXXXX`
|
TMPFILE=`mktemp ${TMPDIR:-/tmp}/e2fsck.log.XXXXXXXXXX`
|
||||||
|
|
||||||
OPTS="-Fttv -C0"
|
OPTS="-Fttv -C0"
|
||||||
#OPTS="-Fttv -E fragcheck"
|
#OPTS="-Fttv -E fragcheck"
|
||||||
|
|
|
@ -21,7 +21,7 @@ if truncate -s $SIZE_2 $TMPFILE 2> /dev/null; then
|
||||||
echo "using $TMPFILE" >> $LOG
|
echo "using $TMPFILE" >> $LOG
|
||||||
else
|
else
|
||||||
rm $TMPFILE
|
rm $TMPFILE
|
||||||
export TMPFILE=$(TMPDIR=. mktemp -t $test_name.tmp.XXXXXX)
|
export TMPFILE=$(mktemp ./$test_name.tmp.XXXXXX)
|
||||||
touch $TMPFILE
|
touch $TMPFILE
|
||||||
echo "using $TMPFILE" >> $LOG
|
echo "using $TMPFILE" >> $LOG
|
||||||
if ! truncate -s $SIZE_2 $TMPFILE >> $LOG 2>&1; then
|
if ! truncate -s $SIZE_2 $TMPFILE >> $LOG 2>&1; then
|
||||||
|
@ -34,7 +34,7 @@ fi
|
||||||
echo $MKE2FS $FEATURES -qF $TMPFILE $SIZE_1 >> $LOG
|
echo $MKE2FS $FEATURES -qF $TMPFILE $SIZE_1 >> $LOG
|
||||||
$MKE2FS $FEATURES -qF $TMPFILE $SIZE_1 >> $LOG
|
$MKE2FS $FEATURES -qF $TMPFILE $SIZE_1 >> $LOG
|
||||||
|
|
||||||
OUT_TMP=$(mktemp -t csum-tmp.XXXXXX)
|
OUT_TMP=$(mktemp ${TMPDIR:-/tmp}/csum-tmp.XXXXXX)
|
||||||
|
|
||||||
date > $OUT_TMP
|
date > $OUT_TMP
|
||||||
cat $E2FSCK >> $OUT_TMP
|
cat $E2FSCK >> $OUT_TMP
|
||||||
|
|
|
@ -30,7 +30,7 @@ fi
|
||||||
|
|
||||||
test_name=`echo $test_dir | sed -e 's;.*/;;'`
|
test_name=`echo $test_dir | sed -e 's;.*/;;'`
|
||||||
|
|
||||||
TMPFILE=$(mktemp -t e2fsprogs-tmp-$test_name.XXXXXX)
|
TMPFILE=$(mktemp ${TMPDIR:-/tmp}/e2fsprogs-tmp-$test_name.XXXXXX)
|
||||||
trap 'rm -f $TMPFILE ; exit' 1 2 15
|
trap 'rm -f $TMPFILE ; exit' 1 2 15
|
||||||
|
|
||||||
if [ -f $test_dir ] ; then
|
if [ -f $test_dir ] ; then
|
||||||
|
|
Loading…
Reference in New Issue