Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
tests
/
qemu-iotests
/
check
diff --git
a/qemu/tests/qemu-iotests/check
b/qemu/tests/qemu-iotests/check
index
1fa6319
..
4cba215
100755
(executable)
--- a/
qemu/tests/qemu-iotests/check
+++ b/
qemu/tests/qemu-iotests/check
@@
-19,7
+19,6
@@
# Control script for QA
#
# Control script for QA
#
-tmp=/tmp/$$
status=0
needwrap=true
try=0
status=0
needwrap=true
try=0
@@
-130,6
+129,8
@@
fi
# exit 1
#fi
# exit 1
#fi
+tmp="${TEST_DIR}"/$$
+
_wallclock()
{
date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
_wallclock()
{
date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
@@
-146,8
+147,8
@@
_wrapup()
# for hangcheck ...
# remove files that were used by hangcheck
#
# for hangcheck ...
# remove files that were used by hangcheck
#
- [ -f
/tmp/check.pid ] && rm -rf /tmp
/check.pid
- [ -f
/tmp/check.sts ] && rm -rf /tmp
/check.sts
+ [ -f
"${TEST_DIR}"/check.pid ] && rm -rf "${TEST_DIR}"
/check.pid
+ [ -f
"${TEST_DIR}"/check.sts ] && rm -rf "${TEST_DIR}"
/check.sts
if $showme
then
if $showme
then
@@
-197,8
+198,8
@@
END { if (NR > 0) {
needwrap=false
fi
needwrap=false
fi
- rm -f
/tmp/*.out /tmp/*.err /tmp
/*.time
- rm -f
/tmp/check.pid /tmp
/check.sts
+ rm -f
"${TEST_DIR}"/*.out "${TEST_DIR}"/*.err "${TEST_DIR}"
/*.time
+ rm -f
"${TEST_DIR}"/check.pid "${TEST_DIR}"
/check.sts
rm -f $tmp.*
}
rm -f $tmp.*
}
@@
-208,16
+209,16
@@
trap "_wrapup; exit \$status" 0 1 2 3 15
# Save pid of check in a well known place, so that hangcheck can be sure it
# has the right pid (getting the pid from ps output is not reliable enough).
#
# Save pid of check in a well known place, so that hangcheck can be sure it
# has the right pid (getting the pid from ps output is not reliable enough).
#
-rm -rf
/tmp
/check.pid
-echo $$ >
/tmp
/check.pid
+rm -rf
"${TEST_DIR}"
/check.pid
+echo $$ >
"${TEST_DIR}"
/check.pid
# for hangcheck ...
# Save the status of check in a well known place, so that hangcheck can be
# sure to know where check is up to (getting test number from ps output is
# not reliable enough since the trace stuff has been introduced).
#
# for hangcheck ...
# Save the status of check in a well known place, so that hangcheck can be
# sure to know where check is up to (getting test number from ps output is
# not reliable enough since the trace stuff has been introduced).
#
-rm -rf
/tmp
/check.sts
-echo "preamble" >
/tmp
/check.sts
+rm -rf
"${TEST_DIR}"
/check.sts
+echo "preamble" >
"${TEST_DIR}"
/check.sts
# don't leave old full output behind on a clean run
rm -f check.full
# don't leave old full output behind on a clean run
rm -f check.full
@@
-231,10
+232,10
@@
FULL_HOST_DETAILS=`_full_platform_details`
#FULL_MOUNT_OPTIONS=`_scratch_mount_options`
cat <<EOF
#FULL_MOUNT_OPTIONS=`_scratch_mount_options`
cat <<EOF
-QEMU --
$QEMU
-QEMU_IMG --
$QEMU_IMG
-QEMU_IO --
$QEMU_IO
-QEMU_NBD --
$QEMU_NBD
+QEMU --
"$QEMU_PROG" $QEMU_OPTIONS
+QEMU_IMG --
"$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS
+QEMU_IO --
"$QEMU_IO_PROG" $QEMU_IO_OPTIONS
+QEMU_NBD --
"$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS
IMGFMT -- $FULL_IMGFMT_DETAILS
IMGPROTO -- $FULL_IMGPROTO_DETAILS
PLATFORM -- $FULL_HOST_DETAILS
IMGFMT -- $FULL_IMGFMT_DETAILS
IMGPROTO -- $FULL_IMGPROTO_DETAILS
PLATFORM -- $FULL_HOST_DETAILS
@@
-285,7
+286,7
@@
do
rm -f core $seq.notrun
# for hangcheck ...
rm -f core $seq.notrun
# for hangcheck ...
- echo "$seq" >
/tmp
/check.sts
+ echo "$seq" >
"${TEST_DIR}"
/check.sts
start=`_wallclock`
$timestamp && echo -n " ["`date "+%T"`"]"
start=`_wallclock`
$timestamp && echo -n " ["`date "+%T"`"]"
@@
-330,6
+331,11
@@
do
fi
reference="$source_iotests/$seq.out"
fi
reference="$source_iotests/$seq.out"
+ reference_machine="$source_iotests/$seq.$QEMU_DEFAULT_MACHINE.out"
+ if [ -f "$reference_machine" ]; then
+ reference="$reference_machine"
+ fi
+
if [ "$CACHEMODE" = "none" ]; then
[ -f "$source_iotests/$seq.out.nocache" ] && reference="$source_iotests/$seq.out.nocache"
fi
if [ "$CACHEMODE" = "none" ]; then
[ -f "$source_iotests/$seq.out.nocache" ] && reference="$source_iotests/$seq.out.nocache"
fi