diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-02-17 17:09:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-18 11:37:11 +0000 |
commit | 220a527d269f146bdabd66040b5bee7de9e3fd3f (patch) | |
tree | 84e71972461bf0b54421afdc30ed3c4194b558f5 | |
parent | a5280f7e303d8b492b26e85fe0a82009806dadfc (diff) | |
download | poky-220a527d269f146bdabd66040b5bee7de9e3fd3f.tar.gz |
gstreamer1.0: disable flaky gstbin:test_watch_for_state_change test
Upstream issue:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778
(From OE-Core rev: 81b4086ddef126513120222d2e7b66f599a27c0d)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch | 107 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb | 1 |
2 files changed, 108 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch new file mode 100644 index 0000000000..f51df6d20b --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch | |||
@@ -0,0 +1,107 @@ | |||
1 | From b935abba3d8fa3ea1ce384c08e650afd8c20b78a Mon Sep 17 00:00:00 2001 | ||
2 | From: Claudius Heine <ch@denx.de> | ||
3 | Date: Wed, 2 Feb 2022 13:47:02 +0100 | ||
4 | Subject: [PATCH] tests: remove gstbin:test_watch_for_state_change testcase | ||
5 | |||
6 | This testcase seems to be flaky, and upstream marked it as such: | ||
7 | https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778 | ||
8 | |||
9 | This patch removes the testcase to avoid it interfering with out ptest. | ||
10 | |||
11 | Signed-off-by: Claudius Heine <ch@denx.de> | ||
12 | |||
13 | Upstream-Status: Inappropriate [needs proper upstream fix] | ||
14 | --- | ||
15 | tests/check/gst/gstbin.c | 69 ------------------- | ||
16 | 1 file changed, 69 deletions(-) | ||
17 | |||
18 | diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c | ||
19 | index e366d5fe20..ac29d81474 100644 | ||
20 | --- a/tests/check/gst/gstbin.c | ||
21 | +++ b/tests/check/gst/gstbin.c | ||
22 | @@ -691,74 +691,6 @@ GST_START_TEST (test_message_state_changed_children) | ||
23 | |||
24 | GST_END_TEST; | ||
25 | |||
26 | -GST_START_TEST (test_watch_for_state_change) | ||
27 | -{ | ||
28 | - GstElement *src, *sink, *bin; | ||
29 | - GstBus *bus; | ||
30 | - GstStateChangeReturn ret; | ||
31 | - | ||
32 | - bin = gst_element_factory_make ("bin", NULL); | ||
33 | - fail_unless (bin != NULL, "Could not create bin"); | ||
34 | - | ||
35 | - bus = g_object_new (gst_bus_get_type (), NULL); | ||
36 | - gst_object_ref_sink (bus); | ||
37 | - gst_element_set_bus (GST_ELEMENT_CAST (bin), bus); | ||
38 | - | ||
39 | - src = gst_element_factory_make ("fakesrc", NULL); | ||
40 | - fail_if (src == NULL, "Could not create fakesrc"); | ||
41 | - sink = gst_element_factory_make ("fakesink", NULL); | ||
42 | - fail_if (sink == NULL, "Could not create fakesink"); | ||
43 | - | ||
44 | - gst_bin_add (GST_BIN (bin), sink); | ||
45 | - gst_bin_add (GST_BIN (bin), src); | ||
46 | - | ||
47 | - fail_unless (gst_element_link (src, sink), "could not link src and sink"); | ||
48 | - | ||
49 | - /* change state, spawning two times three messages */ | ||
50 | - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); | ||
51 | - fail_unless (ret == GST_STATE_CHANGE_ASYNC); | ||
52 | - ret = | ||
53 | - gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, | ||
54 | - GST_CLOCK_TIME_NONE); | ||
55 | - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); | ||
56 | - | ||
57 | - pop_state_changed (bus, 6); | ||
58 | - pop_async_done (bus); | ||
59 | - pop_latency (bus); | ||
60 | - | ||
61 | - fail_unless (gst_bus_have_pending (bus) == FALSE, | ||
62 | - "Unexpected messages on bus"); | ||
63 | - | ||
64 | - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); | ||
65 | - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); | ||
66 | - | ||
67 | - pop_state_changed (bus, 3); | ||
68 | - | ||
69 | - /* this one might return either SUCCESS or ASYNC, likely SUCCESS */ | ||
70 | - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); | ||
71 | - gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE); | ||
72 | - | ||
73 | - pop_state_changed (bus, 3); | ||
74 | - if (ret == GST_STATE_CHANGE_ASYNC) { | ||
75 | - pop_async_done (bus); | ||
76 | - pop_latency (bus); | ||
77 | - } | ||
78 | - | ||
79 | - fail_unless (gst_bus_have_pending (bus) == FALSE, | ||
80 | - "Unexpected messages on bus"); | ||
81 | - | ||
82 | - gst_bus_set_flushing (bus, TRUE); | ||
83 | - | ||
84 | - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL); | ||
85 | - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); | ||
86 | - | ||
87 | - /* clean up */ | ||
88 | - gst_object_unref (bus); | ||
89 | - gst_object_unref (bin); | ||
90 | -} | ||
91 | - | ||
92 | -GST_END_TEST; | ||
93 | - | ||
94 | GST_START_TEST (test_state_change_error_message) | ||
95 | { | ||
96 | GstElement *src, *sink, *bin; | ||
97 | @@ -1956,7 +1888,6 @@ gst_bin_suite (void) | ||
98 | tcase_add_test (tc_chain, test_message_state_changed); | ||
99 | tcase_add_test (tc_chain, test_message_state_changed_child); | ||
100 | tcase_add_test (tc_chain, test_message_state_changed_children); | ||
101 | - tcase_add_test (tc_chain, test_watch_for_state_change); | ||
102 | tcase_add_test (tc_chain, test_state_change_error_message); | ||
103 | tcase_add_test (tc_chain, test_add_linked); | ||
104 | tcase_add_test (tc_chain, test_add_self); | ||
105 | -- | ||
106 | 2.33.1 | ||
107 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb index 243f99fee9..ba4fa24911 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.bb | |||
@@ -21,6 +21,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x | |||
21 | file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \ | 21 | file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \ |
22 | file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ | 22 | file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ |
23 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ | 23 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ |
24 | file://0005-tests-remove-gstbin-test_watch_for_state_change-test.patch \ | ||
24 | " | 25 | " |
25 | SRC_URI[sha256sum] = "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7" | 26 | SRC_URI[sha256sum] = "edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7" |
26 | 27 | ||