summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc-André Lureau2015-11-12 12:10:18 +0100
committerPeter Maydell2015-11-12 12:57:58 +0100
commit2048a2a49188af7a9df065f7553021f89d8e9ec5 (patch)
tree6be22f5180772ec4bb5eff252d736b1c1099ad4b /tests
parentMerge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-11-11' into... (diff)
downloadqemu-2048a2a49188af7a9df065f7553021f89d8e9ec5.tar.gz
qemu-2048a2a49188af7a9df065f7553021f89d8e9ec5.tar.xz
qemu-2048a2a49188af7a9df065f7553021f89d8e9ec5.zip
tests: classify some ivshmem tests as slow
Some tests may take long to run, move them under g_test_slow() condition. The 5s timeout for the "server" test will have to be adjusted to the worst known time (for the records, it takes ~0.2s on my host). The "pair" test takes ~1.7, a quickest version could be implemented. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 1447326618-11686-1-git-send-email-marcandre.lureau@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/ivshmem-test.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c
index c8f0cf0f70..f1793ba6fb 100644
--- a/tests/ivshmem-test.c
+++ b/tests/ivshmem-test.c
@@ -478,10 +478,12 @@ int main(int argc, char **argv)
tmpserver = g_strconcat(tmpdir, "/server", NULL);
qtest_add_func("/ivshmem/single", test_ivshmem_single);
- qtest_add_func("/ivshmem/pair", test_ivshmem_pair);
- qtest_add_func("/ivshmem/server", test_ivshmem_server);
qtest_add_func("/ivshmem/hotplug", test_ivshmem_hotplug);
qtest_add_func("/ivshmem/memdev", test_ivshmem_memdev);
+ if (g_test_slow()) {
+ qtest_add_func("/ivshmem/pair", test_ivshmem_pair);
+ qtest_add_func("/ivshmem/server", test_ivshmem_server);
+ }
ret = g_test_run();