diff options
| author | Peter Maydell | 2020-11-24 16:50:11 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-11-24 16:50:11 +0100 |
| commit | cef64a0b347b8fda1a6f8b65ce435d4569c3969e (patch) | |
| tree | bc1f92fc3a1651ed2fc629f0f1f966611a639e94 | |
| parent | Merge remote-tracking branch 'remotes/dg-gitlab/tags/ppc-for-5.2-20201124' in... (diff) | |
| parent | tests/9pfs: Mark "local" tests as "slow" (diff) | |
| download | qemu-cef64a0b347b8fda1a6f8b65ce435d4569c3969e.tar.gz qemu-cef64a0b347b8fda1a6f8b65ce435d4569c3969e.tar.xz qemu-cef64a0b347b8fda1a6f8b65ce435d4569c3969e.zip | |
Merge remote-tracking branch 'remotes/gkurz-gitlab/tags/9p-fix-2020-11-24' into staging
Mark "local" qtests as slow to avoid unwanted breakage of "make check"
with some configurations (eg. Fedora's Copr automatic build system).
# gpg: Signature made Tue 24 Nov 2020 11:45:14 GMT
# gpg: using RSA key B4828BAF943140CEF2A3491071D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>" [full]
# gpg: aka "Gregory Kurz <gregory.kurz@free.fr>" [full]
# gpg: aka "[jpeg image of size 3330]" [full]
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3 4910 71D4 D5E5 822F 73D6
* remotes/gkurz-gitlab/tags/9p-fix-2020-11-24:
tests/9pfs: Mark "local" tests as "slow"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tests/qtest/virtio-9p-test.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index 21e340fa5f..92a498f249 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -1456,6 +1456,15 @@ static void register_virtio_9p_test(void) /* 9pfs test cases using the 'local' filesystem driver */ + + /* + * XXX: Until we are sure that these tests can run everywhere, + * keep them as "slow" so that they aren't run with "make check". + */ + if (!g_test_slow()) { + return; + } + opts.before = assign_9p_local_driver; qos_add_test("local/config", "virtio-9p", pci_config, &opts); qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts); |