qemu-iotests: Whitespace cleanup
These scripts used to have a four characters indentation, with eight consecutive spaces converted into a tab. Convert everything into spaces. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf
Stefan Hajnoczi
parent
8caf907f07
commit
79e40ab10e
|
|
@ -78,50 +78,50 @@ _wrapup()
|
|||
|
||||
if $showme
|
||||
then
|
||||
:
|
||||
:
|
||||
elif $needwrap
|
||||
then
|
||||
if [ -f check.time -a -f $tmp.time ]
|
||||
then
|
||||
cat check.time $tmp.time \
|
||||
| $AWK_PROG '
|
||||
{ t[$1] = $2 }
|
||||
END { if (NR > 0) {
|
||||
for (i in t) print i " " t[i]
|
||||
}
|
||||
}' \
|
||||
| sort -n >$tmp.out
|
||||
mv $tmp.out check.time
|
||||
fi
|
||||
if [ -f check.time -a -f $tmp.time ]
|
||||
then
|
||||
cat check.time $tmp.time \
|
||||
| $AWK_PROG '
|
||||
{ t[$1] = $2 }
|
||||
END { if (NR > 0) {
|
||||
for (i in t) print i " " t[i]
|
||||
}
|
||||
}' \
|
||||
| sort -n >$tmp.out
|
||||
mv $tmp.out check.time
|
||||
fi
|
||||
|
||||
if [ -f $tmp.expunged ]
|
||||
then
|
||||
notrun=`wc -l <$tmp.expunged | sed -e 's/ *//g'`
|
||||
try=`expr $try - $notrun`
|
||||
list=`echo "$list" | sed -f $tmp.expunged`
|
||||
fi
|
||||
if [ -f $tmp.expunged ]
|
||||
then
|
||||
notrun=`wc -l <$tmp.expunged | sed -e 's/ *//g'`
|
||||
try=`expr $try - $notrun`
|
||||
list=`echo "$list" | sed -f $tmp.expunged`
|
||||
fi
|
||||
|
||||
echo "" >>check.log
|
||||
date >>check.log
|
||||
echo $list | fmt | sed -e 's/^/ /' >>check.log
|
||||
$interrupt && echo "Interrupted!" >>check.log
|
||||
|
||||
if [ ! -z "$notrun" ]
|
||||
then
|
||||
echo "Not run:$notrun"
|
||||
echo "Not run:$notrun" >>check.log
|
||||
fi
|
||||
echo "" >>check.log
|
||||
date >>check.log
|
||||
echo $list | fmt | sed -e 's/^/ /' >>check.log
|
||||
$interrupt && echo "Interrupted!" >>check.log
|
||||
|
||||
if [ ! -z "$notrun" ]
|
||||
then
|
||||
echo "Not run:$notrun"
|
||||
echo "Not run:$notrun" >>check.log
|
||||
fi
|
||||
if [ ! -z "$n_bad" -a $n_bad != 0 ]
|
||||
then
|
||||
echo "Failures:$bad"
|
||||
echo "Failed $n_bad of $try tests"
|
||||
echo "Failures:$bad" | fmt >>check.log
|
||||
echo "Failed $n_bad of $try tests" >>check.log
|
||||
else
|
||||
echo "Passed all $try tests"
|
||||
echo "Passed all $try tests" >>check.log
|
||||
fi
|
||||
needwrap=false
|
||||
then
|
||||
echo "Failures:$bad"
|
||||
echo "Failed $n_bad of $try tests"
|
||||
echo "Failures:$bad" | fmt >>check.log
|
||||
echo "Failed $n_bad of $try tests" >>check.log
|
||||
else
|
||||
echo "Passed all $try tests"
|
||||
echo "Passed all $try tests" >>check.log
|
||||
fi
|
||||
needwrap=false
|
||||
fi
|
||||
|
||||
rm -f /tmp/*.out /tmp/*.err /tmp/*.time
|
||||
|
|
@ -185,82 +185,82 @@ do
|
|||
|
||||
if $showme
|
||||
then
|
||||
echo
|
||||
continue
|
||||
elif [ -f expunged ] && $expunge && egrep "^$seq([ ]|\$)" expunged >/dev/null
|
||||
echo
|
||||
continue
|
||||
elif [ -f expunged ] && $expunge && egrep "^$seq([ ]|\$)" expunged >/dev/null
|
||||
then
|
||||
echo " - expunged"
|
||||
rm -f $seq.out.bad
|
||||
echo "/^$seq\$/d" >>$tmp.expunged
|
||||
echo " - expunged"
|
||||
rm -f $seq.out.bad
|
||||
echo "/^$seq\$/d" >>$tmp.expunged
|
||||
elif [ ! -f $seq ]
|
||||
then
|
||||
echo " - no such test?"
|
||||
echo "/^$seq\$/d" >>$tmp.expunged
|
||||
echo " - no such test?"
|
||||
echo "/^$seq\$/d" >>$tmp.expunged
|
||||
else
|
||||
# really going to try and run this one
|
||||
#
|
||||
rm -f $seq.out.bad
|
||||
lasttime=`sed -n -e "/^$seq /s/.* //p" <check.time`
|
||||
if [ "X$lasttime" != X ]; then
|
||||
echo -n " ${lasttime}s ..."
|
||||
else
|
||||
echo -n " " # prettier output with timestamps.
|
||||
fi
|
||||
rm -f core $seq.notrun
|
||||
# really going to try and run this one
|
||||
#
|
||||
rm -f $seq.out.bad
|
||||
lasttime=`sed -n -e "/^$seq /s/.* //p" <check.time`
|
||||
if [ "X$lasttime" != X ]; then
|
||||
echo -n " ${lasttime}s ..."
|
||||
else
|
||||
echo -n " " # prettier output with timestamps.
|
||||
fi
|
||||
rm -f core $seq.notrun
|
||||
|
||||
# for hangcheck ...
|
||||
echo "$seq" >/tmp/check.sts
|
||||
# for hangcheck ...
|
||||
echo "$seq" >/tmp/check.sts
|
||||
|
||||
start=`_wallclock`
|
||||
$timestamp && echo -n " ["`date "+%T"`"]"
|
||||
[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
|
||||
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \
|
||||
./$seq >$tmp.out 2>&1
|
||||
sts=$?
|
||||
$timestamp && _timestamp
|
||||
stop=`_wallclock`
|
||||
start=`_wallclock`
|
||||
$timestamp && echo -n " ["`date "+%T"`"]"
|
||||
[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
|
||||
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \
|
||||
./$seq >$tmp.out 2>&1
|
||||
sts=$?
|
||||
$timestamp && _timestamp
|
||||
stop=`_wallclock`
|
||||
|
||||
if [ -f core ]
|
||||
then
|
||||
echo -n " [dumped core]"
|
||||
mv core $seq.core
|
||||
err=true
|
||||
fi
|
||||
if [ -f core ]
|
||||
then
|
||||
echo -n " [dumped core]"
|
||||
mv core $seq.core
|
||||
err=true
|
||||
fi
|
||||
|
||||
if [ -f $seq.notrun ]
|
||||
then
|
||||
$timestamp || echo -n " [not run] "
|
||||
$timestamp && echo " [not run]" && echo -n " $seq -- "
|
||||
cat $seq.notrun
|
||||
notrun="$notrun $seq"
|
||||
else
|
||||
if [ $sts -ne 0 ]
|
||||
then
|
||||
echo -n " [failed, exit status $sts]"
|
||||
err=true
|
||||
fi
|
||||
if [ ! -f $seq.out ]
|
||||
then
|
||||
echo " - no qualified output"
|
||||
err=true
|
||||
else
|
||||
if diff -w $seq.out $tmp.out >/dev/null 2>&1
|
||||
then
|
||||
echo ""
|
||||
if $err
|
||||
then
|
||||
:
|
||||
else
|
||||
echo "$seq `expr $stop - $start`" >>$tmp.time
|
||||
fi
|
||||
else
|
||||
echo " - output mismatch (see $seq.out.bad)"
|
||||
mv $tmp.out $seq.out.bad
|
||||
$diff -w $seq.out $seq.out.bad
|
||||
err=true
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if [ -f $seq.notrun ]
|
||||
then
|
||||
$timestamp || echo -n " [not run] "
|
||||
$timestamp && echo " [not run]" && echo -n " $seq -- "
|
||||
cat $seq.notrun
|
||||
notrun="$notrun $seq"
|
||||
else
|
||||
if [ $sts -ne 0 ]
|
||||
then
|
||||
echo -n " [failed, exit status $sts]"
|
||||
err=true
|
||||
fi
|
||||
if [ ! -f $seq.out ]
|
||||
then
|
||||
echo " - no qualified output"
|
||||
err=true
|
||||
else
|
||||
if diff -w $seq.out $tmp.out >/dev/null 2>&1
|
||||
then
|
||||
echo ""
|
||||
if $err
|
||||
then
|
||||
:
|
||||
else
|
||||
echo "$seq `expr $stop - $start`" >>$tmp.time
|
||||
fi
|
||||
else
|
||||
echo " - output mismatch (see $seq.out.bad)"
|
||||
mv $tmp.out $seq.out.bad
|
||||
$diff -w $seq.out $seq.out.bad
|
||||
err=true
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -268,12 +268,12 @@ do
|
|||
#
|
||||
if $err
|
||||
then
|
||||
bad="$bad $seq"
|
||||
n_bad=`expr $n_bad + 1`
|
||||
quick=false
|
||||
bad="$bad $seq"
|
||||
n_bad=`expr $n_bad + 1`
|
||||
quick=false
|
||||
fi
|
||||
[ -f $seq.notrun ] || try=`expr $try + 1`
|
||||
|
||||
|
||||
seq="after_$seq"
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -54,58 +54,58 @@ do
|
|||
|
||||
if $group
|
||||
then
|
||||
# arg after -g
|
||||
group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
|
||||
# arg after -g
|
||||
group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
|
||||
s/ .*//p
|
||||
}'`
|
||||
if [ -z "$group_list" ]
|
||||
then
|
||||
echo "Group \"$r\" is empty or not defined?"
|
||||
exit 1
|
||||
fi
|
||||
[ ! -s $tmp.list ] && touch $tmp.list
|
||||
for t in $group_list
|
||||
do
|
||||
if grep -s "^$t\$" $tmp.list >/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
echo "$t" >>$tmp.list
|
||||
fi
|
||||
done
|
||||
group=false
|
||||
continue
|
||||
if [ -z "$group_list" ]
|
||||
then
|
||||
echo "Group \"$r\" is empty or not defined?"
|
||||
exit 1
|
||||
fi
|
||||
[ ! -s $tmp.list ] && touch $tmp.list
|
||||
for t in $group_list
|
||||
do
|
||||
if grep -s "^$t\$" $tmp.list >/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
echo "$t" >>$tmp.list
|
||||
fi
|
||||
done
|
||||
group=false
|
||||
continue
|
||||
|
||||
elif $xgroup
|
||||
then
|
||||
# arg after -x
|
||||
[ ! -s $tmp.list ] && ls [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] >$tmp.list 2>/dev/null
|
||||
group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
|
||||
# arg after -x
|
||||
[ ! -s $tmp.list ] && ls [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] >$tmp.list 2>/dev/null
|
||||
group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
|
||||
s/ .*//p
|
||||
}'`
|
||||
if [ -z "$group_list" ]
|
||||
then
|
||||
echo "Group \"$r\" is empty or not defined?"
|
||||
exit 1
|
||||
fi
|
||||
numsed=0
|
||||
rm -f $tmp.sed
|
||||
for t in $group_list
|
||||
do
|
||||
if [ $numsed -gt 100 ]
|
||||
then
|
||||
sed -f $tmp.sed <$tmp.list >$tmp.tmp
|
||||
mv $tmp.tmp $tmp.list
|
||||
numsed=0
|
||||
rm -f $tmp.sed
|
||||
fi
|
||||
echo "/^$t\$/d" >>$tmp.sed
|
||||
numsed=`expr $numsed + 1`
|
||||
done
|
||||
sed -f $tmp.sed <$tmp.list >$tmp.tmp
|
||||
mv $tmp.tmp $tmp.list
|
||||
xgroup=false
|
||||
continue
|
||||
if [ -z "$group_list" ]
|
||||
then
|
||||
echo "Group \"$r\" is empty or not defined?"
|
||||
exit 1
|
||||
fi
|
||||
numsed=0
|
||||
rm -f $tmp.sed
|
||||
for t in $group_list
|
||||
do
|
||||
if [ $numsed -gt 100 ]
|
||||
then
|
||||
sed -f $tmp.sed <$tmp.list >$tmp.tmp
|
||||
mv $tmp.tmp $tmp.list
|
||||
numsed=0
|
||||
rm -f $tmp.sed
|
||||
fi
|
||||
echo "/^$t\$/d" >>$tmp.sed
|
||||
numsed=`expr $numsed + 1`
|
||||
done
|
||||
sed -f $tmp.sed <$tmp.list >$tmp.tmp
|
||||
mv $tmp.tmp $tmp.list
|
||||
xgroup=false
|
||||
continue
|
||||
|
||||
elif $imgopts
|
||||
then
|
||||
|
|
@ -119,11 +119,11 @@ s/ .*//p
|
|||
case "$r"
|
||||
in
|
||||
|
||||
-\? | -h | --help) # usage
|
||||
echo "Usage: $0 [options] [testlist]"'
|
||||
-\? | -h | --help) # usage
|
||||
echo "Usage: $0 [options] [testlist]"'
|
||||
|
||||
common options
|
||||
-v verbose
|
||||
-v verbose
|
||||
|
||||
check options
|
||||
-raw test raw (default)
|
||||
|
|
@ -138,162 +138,162 @@ check options
|
|||
-sheepdog test sheepdog
|
||||
-nbd test nbd
|
||||
-ssh test ssh
|
||||
-xdiff graphical mode diff
|
||||
-nocache use O_DIRECT on backing file
|
||||
-misalign misalign memory allocations
|
||||
-n show me, do not run tests
|
||||
-xdiff graphical mode diff
|
||||
-nocache use O_DIRECT on backing file
|
||||
-misalign misalign memory allocations
|
||||
-n show me, do not run tests
|
||||
-o options -o options to pass to qemu-img create/convert
|
||||
-T output timestamps
|
||||
-r randomize test order
|
||||
|
||||
-T output timestamps
|
||||
-r randomize test order
|
||||
|
||||
testlist options
|
||||
-g group[,group...] include tests from these groups
|
||||
-x group[,group...] exclude tests from these groups
|
||||
NNN include test NNN
|
||||
NNN-NNN include test range (eg. 012-021)
|
||||
-g group[,group...] include tests from these groups
|
||||
-x group[,group...] exclude tests from these groups
|
||||
NNN include test NNN
|
||||
NNN-NNN include test range (eg. 012-021)
|
||||
'
|
||||
exit 0
|
||||
;;
|
||||
exit 0
|
||||
;;
|
||||
|
||||
-raw)
|
||||
IMGFMT=raw
|
||||
xpand=false
|
||||
;;
|
||||
-raw)
|
||||
IMGFMT=raw
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-cow)
|
||||
IMGFMT=cow
|
||||
xpand=false
|
||||
;;
|
||||
-cow)
|
||||
IMGFMT=cow
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-qcow)
|
||||
IMGFMT=qcow
|
||||
xpand=false
|
||||
;;
|
||||
-qcow)
|
||||
IMGFMT=qcow
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-qcow2)
|
||||
IMGFMT=qcow2
|
||||
xpand=false
|
||||
;;
|
||||
-qcow2)
|
||||
IMGFMT=qcow2
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-qed)
|
||||
IMGFMT=qed
|
||||
xpand=false
|
||||
;;
|
||||
-qed)
|
||||
IMGFMT=qed
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-vdi)
|
||||
IMGFMT=vdi
|
||||
xpand=false
|
||||
;;
|
||||
-vdi)
|
||||
IMGFMT=vdi
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-vmdk)
|
||||
IMGFMT=vmdk
|
||||
xpand=false
|
||||
;;
|
||||
-vmdk)
|
||||
IMGFMT=vmdk
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-vpc)
|
||||
IMGFMT=vpc
|
||||
xpand=false
|
||||
;;
|
||||
-vpc)
|
||||
IMGFMT=vpc
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-rbd)
|
||||
IMGPROTO=rbd
|
||||
xpand=false
|
||||
;;
|
||||
-sheepdog)
|
||||
IMGPROTO=sheepdog
|
||||
xpand=false
|
||||
;;
|
||||
-nbd)
|
||||
IMGPROTO=nbd
|
||||
xpand=false
|
||||
;;
|
||||
-rbd)
|
||||
IMGPROTO=rbd
|
||||
xpand=false
|
||||
;;
|
||||
-sheepdog)
|
||||
IMGPROTO=sheepdog
|
||||
xpand=false
|
||||
;;
|
||||
-nbd)
|
||||
IMGPROTO=nbd
|
||||
xpand=false
|
||||
;;
|
||||
-ssh)
|
||||
IMGPROTO=ssh
|
||||
xpand=false
|
||||
;;
|
||||
-nocache)
|
||||
QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --nocache"
|
||||
xpand=false
|
||||
;;
|
||||
-nocache)
|
||||
QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --nocache"
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-misalign)
|
||||
QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --misalign"
|
||||
xpand=false
|
||||
;;
|
||||
-misalign)
|
||||
QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --misalign"
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-valgrind)
|
||||
valgrind=true
|
||||
xpand=false
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-g) # -g group ... pick from group file
|
||||
group=true
|
||||
xpand=false
|
||||
;;
|
||||
-g) # -g group ... pick from group file
|
||||
group=true
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-xdiff) # graphical diff mode
|
||||
xpand=false
|
||||
-xdiff) # graphical diff mode
|
||||
xpand=false
|
||||
|
||||
if [ ! -z "$DISPLAY" ]
|
||||
then
|
||||
which xdiff >/dev/null 2>&1 && diff=xdiff
|
||||
which gdiff >/dev/null 2>&1 && diff=gdiff
|
||||
which tkdiff >/dev/null 2>&1 && diff=tkdiff
|
||||
which xxdiff >/dev/null 2>&1 && diff=xxdiff
|
||||
fi
|
||||
;;
|
||||
if [ ! -z "$DISPLAY" ]
|
||||
then
|
||||
which xdiff >/dev/null 2>&1 && diff=xdiff
|
||||
which gdiff >/dev/null 2>&1 && diff=gdiff
|
||||
which tkdiff >/dev/null 2>&1 && diff=tkdiff
|
||||
which xxdiff >/dev/null 2>&1 && diff=xxdiff
|
||||
fi
|
||||
;;
|
||||
|
||||
-n) # show me, don't do it
|
||||
showme=true
|
||||
xpand=false
|
||||
;;
|
||||
-n) # show me, don't do it
|
||||
showme=true
|
||||
xpand=false
|
||||
;;
|
||||
-o)
|
||||
imgopts=true
|
||||
xpand=false
|
||||
;;
|
||||
-r) # randomize test order
|
||||
randomize=true
|
||||
xpand=false
|
||||
;;
|
||||
-r) # randomize test order
|
||||
randomize=true
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-T) # turn on timestamp output
|
||||
timestamp=true
|
||||
xpand=false
|
||||
;;
|
||||
-T) # turn on timestamp output
|
||||
timestamp=true
|
||||
xpand=false
|
||||
;;
|
||||
|
||||
-v)
|
||||
verbose=true
|
||||
xpand=false
|
||||
;;
|
||||
-x) # -x group ... exclude from group file
|
||||
xgroup=true
|
||||
xpand=false
|
||||
;;
|
||||
'[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]')
|
||||
echo "No tests?"
|
||||
status=1
|
||||
exit $status
|
||||
;;
|
||||
-v)
|
||||
verbose=true
|
||||
xpand=false
|
||||
;;
|
||||
-x) # -x group ... exclude from group file
|
||||
xgroup=true
|
||||
xpand=false
|
||||
;;
|
||||
'[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]')
|
||||
echo "No tests?"
|
||||
status=1
|
||||
exit $status
|
||||
;;
|
||||
|
||||
[0-9]*-[0-9]*)
|
||||
eval `echo $r | sed -e 's/^/start=/' -e 's/-/ end=/'`
|
||||
;;
|
||||
[0-9]*-[0-9]*)
|
||||
eval `echo $r | sed -e 's/^/start=/' -e 's/-/ end=/'`
|
||||
;;
|
||||
|
||||
[0-9]*-)
|
||||
eval `echo $r | sed -e 's/^/start=/' -e 's/-//'`
|
||||
end=`echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'`
|
||||
if [ -z "$end" ]
|
||||
then
|
||||
echo "No tests in range \"$r\"?"
|
||||
status=1
|
||||
exit $status
|
||||
fi
|
||||
;;
|
||||
[0-9]*-)
|
||||
eval `echo $r | sed -e 's/^/start=/' -e 's/-//'`
|
||||
end=`echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'`
|
||||
if [ -z "$end" ]
|
||||
then
|
||||
echo "No tests in range \"$r\"?"
|
||||
status=1
|
||||
exit $status
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
start=$r
|
||||
end=$r
|
||||
;;
|
||||
*)
|
||||
start=$r
|
||||
end=$r
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
|
|
@ -303,26 +303,26 @@ testlist options
|
|||
|
||||
if $xpand
|
||||
then
|
||||
have_test_arg=true
|
||||
$AWK_PROG </dev/null '
|
||||
BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
|
||||
| while read id
|
||||
do
|
||||
if grep -s "^$id " group >/dev/null
|
||||
then
|
||||
# in group file ... OK
|
||||
echo $id >>$tmp.list
|
||||
else
|
||||
if [ -f expunged ] && $expunge && egrep "^$id([ ]|\$)" expunged >/dev/null
|
||||
then
|
||||
# expunged ... will be reported, but not run, later
|
||||
echo $id >>$tmp.list
|
||||
else
|
||||
# oops
|
||||
echo "$id - unknown test, ignored"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
have_test_arg=true
|
||||
$AWK_PROG </dev/null '
|
||||
BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
|
||||
| while read id
|
||||
do
|
||||
if grep -s "^$id " group >/dev/null
|
||||
then
|
||||
# in group file ... OK
|
||||
echo $id >>$tmp.list
|
||||
else
|
||||
if [ -f expunged ] && $expunge && egrep "^$id([ ]|\$)" expunged >/dev/null
|
||||
then
|
||||
# expunged ... will be reported, but not run, later
|
||||
echo $id >>$tmp.list
|
||||
else
|
||||
# oops
|
||||
echo "$id - unknown test, ignored"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
done
|
||||
|
|
@ -337,11 +337,11 @@ then
|
|||
else
|
||||
if $have_test_arg
|
||||
then
|
||||
# had test numbers, but none in group file ... do nothing
|
||||
touch $tmp.list
|
||||
# had test numbers, but none in group file ... do nothing
|
||||
touch $tmp.list
|
||||
else
|
||||
# no test numbers, do everything from group file
|
||||
sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <group >$tmp.list
|
||||
# no test numbers, do everything from group file
|
||||
sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <group >$tmp.list
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
# setup and check for config parameters, and in particular
|
||||
#
|
||||
# EMAIL - email of the script runner.
|
||||
# TEST_DIR - scratch test directory
|
||||
# TEST_DIR - scratch test directory
|
||||
#
|
||||
# - These can be added to $HOST_CONFIG_DIR (witch default to ./config)
|
||||
# below or a separate local configuration file can be used (using
|
||||
|
|
@ -111,11 +111,11 @@ export QEMU_NBD=$QEMU_NBD_PROG
|
|||
[ -f /etc/qemu-iotest.config ] && . /etc/qemu-iotest.config
|
||||
|
||||
if [ -z "$TEST_DIR" ]; then
|
||||
TEST_DIR=`pwd`/scratch
|
||||
TEST_DIR=`pwd`/scratch
|
||||
fi
|
||||
|
||||
if [ ! -e "$TEST_DIR" ]; then
|
||||
mkdir "$TEST_DIR"
|
||||
mkdir "$TEST_DIR"
|
||||
fi
|
||||
|
||||
if [ ! -d "$TEST_DIR" ]; then
|
||||
|
|
|
|||
|
|
@ -25,19 +25,19 @@
|
|||
# Outputs suitable message to stdout if it's not in range.
|
||||
#
|
||||
# A verbose option, -v, may be used as the LAST argument
|
||||
#
|
||||
# e.g.
|
||||
#
|
||||
# e.g.
|
||||
# foo: 0.0298 = 0.03 +/- 5%
|
||||
# _within_tolerance "foo" 0.0298 0.03 5%
|
||||
#
|
||||
# _within_tolerance "foo" 0.0298 0.03 5%
|
||||
#
|
||||
# foo: 0.0298 = 0.03 +/- 0.01
|
||||
# _within_tolerance "foo" 0.0298 0.03 0.01
|
||||
#
|
||||
# foo: 0.0298 = 0.03 -0.01 +0.002
|
||||
# _within_tolerance "foo" 0.0298 0.03 0.01 0.002
|
||||
#
|
||||
# foo: verbose output of 0.0298 = 0.03 +/- 5%
|
||||
# _within_tolerance "foo" 0.0298 0.03 5% -v
|
||||
# foo: verbose output of 0.0298 = 0.03 +/- 5%
|
||||
# _within_tolerance "foo" 0.0298 0.03 5% -v
|
||||
_within_tolerance()
|
||||
{
|
||||
_name=$1
|
||||
|
|
@ -51,10 +51,10 @@ _within_tolerance()
|
|||
# maxtol arg is optional
|
||||
# verbose arg is optional
|
||||
if [ $# -ge 5 ]
|
||||
then
|
||||
then
|
||||
if [ "$5" = "-v" ]
|
||||
then
|
||||
_verbose=1
|
||||
_verbose=1
|
||||
else
|
||||
_maxtol=$5
|
||||
fi
|
||||
|
|
@ -65,18 +65,18 @@ _within_tolerance()
|
|||
fi
|
||||
|
||||
# find min with or without %
|
||||
_mintolerance=`echo $_mintol | sed -e 's/%//'`
|
||||
_mintolerance=`echo $_mintol | sed -e 's/%//'`
|
||||
if [ $_mintol = $_mintolerance ]
|
||||
then
|
||||
then
|
||||
_min=`echo "scale=5; $_correct_val-$_mintolerance" | bc`
|
||||
else
|
||||
_min=`echo "scale=5; $_correct_val-$_mintolerance*0.01*$_correct_val" | bc`
|
||||
fi
|
||||
|
||||
# find max with or without %
|
||||
_maxtolerance=`echo $_maxtol | sed -e 's/%//'`
|
||||
_maxtolerance=`echo $_maxtol | sed -e 's/%//'`
|
||||
if [ $_maxtol = $_maxtolerance ]
|
||||
then
|
||||
then
|
||||
_max=`echo "scale=5; $_correct_val+$_maxtolerance" | bc`
|
||||
else
|
||||
_max=`echo "scale=5; $_correct_val+$_maxtolerance*0.01*$_correct_val" | bc`
|
||||
|
|
@ -88,7 +88,7 @@ _within_tolerance()
|
|||
cat <<EOF >$tmp.bc.1
|
||||
scale=5;
|
||||
if ($_min <= $_given_val) 1;
|
||||
if ($_min > $_given_val) 0;
|
||||
if ($_min > $_given_val) 0;
|
||||
EOF
|
||||
|
||||
cat <<EOF >$tmp.bc.2
|
||||
|
|
@ -102,21 +102,21 @@ EOF
|
|||
|
||||
rm -f $tmp.bc.[12]
|
||||
|
||||
_in_range=`expr $_above_min \& $_below_max`
|
||||
_in_range=`expr $_above_min \& $_below_max`
|
||||
|
||||
# fix up min, max precision for output
|
||||
# can vary for 5.3, 6.2
|
||||
_min=`echo $_min | sed -e 's/0*$//'` # get rid of trailling zeroes
|
||||
_max=`echo $_max | sed -e 's/0*$//'` # get rid of trailling zeroes
|
||||
|
||||
if [ $_in_range -eq 1 ]
|
||||
if [ $_in_range -eq 1 ]
|
||||
then
|
||||
[ $_verbose -eq 1 ] && echo $_name is in range
|
||||
return 0
|
||||
[ $_verbose -eq 1 ] && echo $_name is in range
|
||||
return 0
|
||||
else
|
||||
[ $_verbose -eq 1 ] && echo $_name has value of $_given_val
|
||||
[ $_verbose -eq 1 ] && echo $_name is NOT in range $_min .. $_max
|
||||
return 1
|
||||
[ $_verbose -eq 1 ] && echo $_name has value of $_given_val
|
||||
[ $_verbose -eq 1 ] && echo $_name is NOT in range $_min .. $_max
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -125,7 +125,7 @@ EOF
|
|||
_filter_date()
|
||||
{
|
||||
sed \
|
||||
-e 's/[A-Z][a-z][a-z] [A-z][a-z][a-z] *[0-9][0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]$/DATE/'
|
||||
-e 's/[A-Z][a-z][a-z] [A-z][a-z][a-z] *[0-9][0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]$/DATE/'
|
||||
}
|
||||
|
||||
# replace occurrences of the actual TEST_DIR value with TEST_DIR
|
||||
|
|
|
|||
|
|
@ -106,8 +106,8 @@ function io_test2() {
|
|||
local num=$3
|
||||
|
||||
# Pattern (repeat after 9 clusters):
|
||||
# used - used - free - used - compressed - compressed -
|
||||
# free - free - compressed
|
||||
# used - used - free - used - compressed - compressed -
|
||||
# free - free - compressed
|
||||
|
||||
# Write the clusters to be compressed
|
||||
echo === Clusters to be compressed [1]
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
dd()
|
||||
{
|
||||
if [ "$HOSTOS" == "Linux" ]
|
||||
then
|
||||
command dd --help | grep noxfer > /dev/null 2>&1
|
||||
|
||||
if [ "$?" -eq 0 ]
|
||||
then
|
||||
command dd status=noxfer $@
|
||||
else
|
||||
command dd $@
|
||||
fi
|
||||
then
|
||||
command dd --help | grep noxfer > /dev/null 2>&1
|
||||
|
||||
if [ "$?" -eq 0 ]
|
||||
then
|
||||
command dd status=noxfer $@
|
||||
else
|
||||
command dd $@
|
||||
fi
|
||||
else
|
||||
command dd $@
|
||||
command dd $@
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -193,8 +193,8 @@ _get_pids_by_name()
|
|||
{
|
||||
if [ $# -ne 1 ]
|
||||
then
|
||||
echo "Usage: _get_pids_by_name process-name" 1>&2
|
||||
exit 1
|
||||
echo "Usage: _get_pids_by_name process-name" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Algorithm ... all ps(1) variants have a time of the form MM:SS or
|
||||
|
|
@ -206,12 +206,12 @@ _get_pids_by_name()
|
|||
|
||||
ps $PS_ALL_FLAGS \
|
||||
| sed -n \
|
||||
-e 's/$/ /' \
|
||||
-e 's/[ ][ ]*/ /g' \
|
||||
-e 's/^ //' \
|
||||
-e 's/^[^ ]* //' \
|
||||
-e "/[0-9]:[0-9][0-9] *[^ ]*\/$1 /s/ .*//p" \
|
||||
-e "/[0-9]:[0-9][0-9] *$1 /s/ .*//p"
|
||||
-e 's/$/ /' \
|
||||
-e 's/[ ][ ]*/ /g' \
|
||||
-e 's/^ //' \
|
||||
-e 's/^[^ ]* //' \
|
||||
-e "/[0-9]:[0-9][0-9] *[^ ]*\/$1 /s/ .*//p" \
|
||||
-e "/[0-9]:[0-9][0-9] *$1 /s/ .*//p"
|
||||
}
|
||||
|
||||
# fqdn for localhost
|
||||
|
|
@ -229,8 +229,8 @@ _need_to_be_root()
|
|||
id=`id | $SED_PROG -e 's/(.*//' -e 's/.*=//'`
|
||||
if [ "$id" -ne 0 ]
|
||||
then
|
||||
echo "Arrgh ... you need to be root (not uid=$id) to run this test"
|
||||
exit 1
|
||||
echo "Arrgh ... you need to be root (not uid=$id) to run this test"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -248,33 +248,33 @@ _need_to_be_root()
|
|||
_do()
|
||||
{
|
||||
if [ $# -eq 1 ]; then
|
||||
_cmd=$1
|
||||
_cmd=$1
|
||||
elif [ $# -eq 2 ]; then
|
||||
_note=$1
|
||||
_cmd=$2
|
||||
echo -n "$_note... "
|
||||
_note=$1
|
||||
_cmd=$2
|
||||
echo -n "$_note... "
|
||||
else
|
||||
echo "Usage: _do [note] cmd" 1>&2
|
||||
status=1; exit
|
||||
echo "Usage: _do [note] cmd" 1>&2
|
||||
status=1; exit
|
||||
fi
|
||||
|
||||
(eval "echo '---' \"$_cmd\"") >>$here/$seq.full
|
||||
(eval "$_cmd") >$tmp._out 2>&1; ret=$?
|
||||
cat $tmp._out >>$here/$seq.full
|
||||
if [ $# -eq 2 ]; then
|
||||
if [ $ret -eq 0 ]; then
|
||||
echo "done"
|
||||
else
|
||||
echo "fail"
|
||||
fi
|
||||
if [ $ret -eq 0 ]; then
|
||||
echo "done"
|
||||
else
|
||||
echo "fail"
|
||||
fi
|
||||
fi
|
||||
if [ $ret -ne 0 ] \
|
||||
&& [ "$_do_die_on_error" = "always" \
|
||||
-o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ]
|
||||
&& [ "$_do_die_on_error" = "always" \
|
||||
-o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ]
|
||||
then
|
||||
[ $# -ne 2 ] && echo
|
||||
eval "echo \"$_cmd\" failed \(returned $ret\): see $seq.full"
|
||||
status=1; exit
|
||||
[ $# -ne 2 ] && echo
|
||||
eval "echo \"$_cmd\" failed \(returned $ret\): see $seq.full"
|
||||
status=1; exit
|
||||
fi
|
||||
|
||||
return $ret
|
||||
|
|
@ -305,9 +305,9 @@ _fail()
|
|||
_supported_fmt()
|
||||
{
|
||||
for f; do
|
||||
if [ "$f" = "$IMGFMT" -o "$f" = "generic" ]; then
|
||||
return
|
||||
fi
|
||||
if [ "$f" = "$IMGFMT" -o "$f" = "generic" ]; then
|
||||
return
|
||||
fi
|
||||
done
|
||||
|
||||
_notrun "not suitable for this image format: $IMGFMT"
|
||||
|
|
@ -318,9 +318,9 @@ _supported_fmt()
|
|||
_supported_proto()
|
||||
{
|
||||
for f; do
|
||||
if [ "$f" = "$IMGPROTO" -o "$f" = "generic" ]; then
|
||||
return
|
||||
fi
|
||||
if [ "$f" = "$IMGPROTO" -o "$f" = "generic" ]; then
|
||||
return
|
||||
fi
|
||||
done
|
||||
|
||||
_notrun "not suitable for this image protocol: $IMGPROTO"
|
||||
|
|
@ -332,10 +332,10 @@ _supported_os()
|
|||
{
|
||||
for h
|
||||
do
|
||||
if [ "$h" = "$HOSTOS" ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
if [ "$h" = "$HOSTOS" ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
done
|
||||
|
||||
_notrun "not suitable for this OS: $HOSTOS"
|
||||
|
|
|
|||
Loading…
Reference in New Issue