diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 12:43:07 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 12:43:07 +0100 |
commit | 87ecd4f3408265fc6403dfbe34fb885057f804ec (patch) | |
tree | 2e2dc15c2505d219bab39dee038d1d76ad2645ea /tests | |
parent | 6fef22d7e650a5a7cad76c6115bea629e75eca9f (diff) | |
parent | a808c0865b720e22ca2929ec3d362d4610fbad51 (diff) | |
download | qemu-87ecd4f3408265fc6403dfbe34fb885057f804ec.zip qemu-87ecd4f3408265fc6403dfbe34fb885057f804ec.tar.gz qemu-87ecd4f3408265fc6403dfbe34fb885057f804ec.tar.bz2 |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-08-14
# gpg: Signature made Mon 14 Aug 2017 12:07:03 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch:
hw/misc/mmio_interface: Return after error_setg() to avoid crash
qemu-iotests: remove comment about root privileges requirement
qemu-iotests: remove commented out variables
qemu-iotests: get rid of _full_imgproto_details()
qemu-doc: Fix "-net van" typo
libqtest: Fix typo in comments
unicore32: abort when entering "x 0" on the monitor
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/libqtest.h | 8 | ||||
-rwxr-xr-x | tests/qemu-iotests/check | 13 | ||||
-rw-r--r-- | tests/qemu-iotests/common.rc | 5 |
3 files changed, 5 insertions, 21 deletions
diff --git a/tests/libqtest.h b/tests/libqtest.h index 38bc1e9..3ae5709 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -117,7 +117,7 @@ QDict *qtest_qmp_receive(QTestState *s); * @s: #QTestState instance to operate on. * @s: #event event to wait for. * - * Continuosly polls for QMP responses until it receives the desired event. + * Continuously polls for QMP responses until it receives the desired event. */ void qtest_qmp_eventwait(QTestState *s, const char *event); @@ -126,7 +126,7 @@ void qtest_qmp_eventwait(QTestState *s, const char *event); * @s: #QTestState instance to operate on. * @s: #event event to wait for. * - * Continuosly polls for QMP responses until it receives the desired event. + * Continuously polls for QMP responses until it receives the desired event. * Returns a copy of the event for further investigation. */ QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event); @@ -571,7 +571,7 @@ static inline QDict *qmp_receive(void) * qmp_eventwait: * @s: #event event to wait for. * - * Continuosly polls for QMP responses until it receives the desired event. + * Continuously polls for QMP responses until it receives the desired event. */ static inline void qmp_eventwait(const char *event) { @@ -582,7 +582,7 @@ static inline void qmp_eventwait(const char *event) * qmp_eventwait_ref: * @s: #event event to wait for. * - * Continuosly polls for QMP responses until it receives the desired event. + * Continuously polls for QMP responses until it receives the desired event. * Returns a copy of the event for further investigation. */ static inline QDict *qmp_eventwait_ref(const char *event) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 2a55ec9..d504b6e 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -123,12 +123,6 @@ fi # we need common . "$source_iotests/common" -#if [ `id -u` -ne 0 ] -#then -# echo "check: QA must be run as root" -# exit 1 -#fi - TIMESTAMP_FILE=check.time-$IMGPROTO-$IMGFMT tmp="${TEST_DIR}"/$$ @@ -228,10 +222,7 @@ rm -f check.full [ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE FULL_IMGFMT_DETAILS=`_full_imgfmt_details` -FULL_IMGPROTO_DETAILS=`_full_imgproto_details` FULL_HOST_DETAILS=`_full_platform_details` -#FULL_MKFS_OPTIONS=`_scratch_mkfs_options` -#FULL_MOUNT_OPTIONS=`_scratch_mount_options` cat <<EOF QEMU -- "$QEMU_PROG" $QEMU_OPTIONS @@ -239,14 +230,12 @@ 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 +IMGPROTO -- $IMGPROTO PLATFORM -- $FULL_HOST_DETAILS TEST_DIR -- $TEST_DIR SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER EOF -#MKFS_OPTIONS -- $FULL_MKFS_OPTIONS -#MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS seq="check" diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index bfbc80e..8d486db 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -482,11 +482,6 @@ _full_imgfmt_details() fi } -_full_imgproto_details() -{ - echo "$IMGPROTO" -} - _full_platform_details() { os=`uname -s` |