diff options
| author | Peter Maydell | 2017-03-07 08:32:28 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-03-07 08:32:28 +0100 |
| commit | 7dc3bc7a043a0492d5a7ff9a88322ba733830337 (patch) | |
| tree | d597190411bf276d0127fdb1c64ba4d4241f87a9 /tests | |
| parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
| parent | tests: check path to avoid a failing qga/get-vcpus test (diff) | |
| download | qemu-7dc3bc7a043a0492d5a7ff9a88322ba733830337.tar.gz qemu-7dc3bc7a043a0492d5a7ff9a88322ba733830337.tar.xz qemu-7dc3bc7a043a0492d5a7ff9a88322ba733830337.zip | |
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2017-03-06-tag' into staging
qemu-ga patch queue for 2.9
* fix fsfreeze for filesystems mounted in multiple locations
* fix test failure when running in a chroot
* support for socket-based activation
# gpg: Signature made Mon 06 Mar 2017 07:54:17 GMT
# gpg: using RSA key 0x3353C9CEF108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg: aka "Michael Roth <mdroth@utexas.edu>"
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D 3FA0 3353 C9CE F108 B584
* remotes/mdroth/tags/qga-pull-2017-03-06-tag:
tests: check path to avoid a failing qga/get-vcpus test
qga: ignore EBUSY when freezing a filesystem
qga: add systemd socket activation support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-qga.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test-qga.c b/tests/test-qga.c index ae97b575c1..c780f0079a 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -924,7 +924,9 @@ int main(int argc, char **argv) g_test_add_data_func("/qga/info", &fix, test_qga_info); g_test_add_data_func("/qga/network-get-interfaces", &fix, test_qga_network_get_interfaces); - g_test_add_data_func("/qga/get-vcpus", &fix, test_qga_get_vcpus); + if (!access("/sys/devices/system/cpu/cpu0", F_OK)) { + g_test_add_data_func("/qga/get-vcpus", &fix, test_qga_get_vcpus); + } g_test_add_data_func("/qga/get-fsinfo", &fix, test_qga_get_fsinfo); g_test_add_data_func("/qga/get-memory-block-info", &fix, test_qga_get_memory_block_info); |