From 4b48a789ef023d18a9e7659e5bdb0eb45c078d0e Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Nov 24 2020 17:50:53 +0000 Subject: Add missing patch Signed-off-by: Cole Robinson --- diff --git a/0001-tests-9pfs-Mark-local-tests-as-slow.patch b/0001-tests-9pfs-Mark-local-tests-as-slow.patch new file mode 100644 index 0000000..5754188 --- /dev/null +++ b/0001-tests-9pfs-Mark-local-tests-as-slow.patch @@ -0,0 +1,40 @@ +From 800fb9e15c9672c79862ab608fe8cc41513310c3 Mon Sep 17 00:00:00 2001 +From: Greg Kurz +Date: Tue, 24 Nov 2020 08:43:43 +0100 +Subject: [PATCH] tests/9pfs: Mark "local" tests as "slow" + +The "local" tests can fail on some automated build systems as +reported here: + +https://lists.nongnu.org/archive/html/qemu-devel/2020-11/msg05510.html + +This will need to be investigated and addressed later. Let's go for a +workaround in the meantime : mark the "local" tests as "slow" so that +they aren't executed with a simple "make check" like in the case above. + +Reported-by: Cole Robinson +Signed-off-by: Greg Kurz +--- + tests/qtest/virtio-9p-test.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +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);