Patchwork rtc-test: Fix test failures with recent glib

login
register
mail settings
Submitter Cole Robinson
Date Feb. 27, 2013, 12:31 a.m.
Message ID <4cef3fca4cde08008905c89cc2b73069e67824bc.1361925092.git.crobinso@redhat.com>
Download mbox | patch
Permalink /patch/223437/
State New
Headers show

Comments

Cole Robinson - Feb. 27, 2013, 12:31 a.m.
As of glib 2.35.4, glib changed its logic for ordering test cases:

https://bugzilla.gnome.org/show_bug.cgi?id=694487

This was causing failures in rtc-test. Group the reordered test
cases into their own suite, which maintains the original ordering.

CC: qemu-stable@nongnu.org
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 tests/rtc-test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Stefan Hajnoczi - March 8, 2013, 9:17 a.m.
On Tue, Feb 26, 2013 at 07:31:32PM -0500, Cole Robinson wrote:
> As of glib 2.35.4, glib changed its logic for ordering test cases:
> 
> https://bugzilla.gnome.org/show_bug.cgi?id=694487
> 
> This was causing failures in rtc-test. Group the reordered test
> cases into their own suite, which maintains the original ordering.
> 
> CC: qemu-stable@nongnu.org
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>  tests/rtc-test.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

It's best to make test cases independent of order (no side-effects), but
this small patch fixes the problem.

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

Patch

diff --git a/tests/rtc-test.c b/tests/rtc-test.c
index c5fd042..9ab583b 100644
--- a/tests/rtc-test.c
+++ b/tests/rtc-test.c
@@ -565,8 +565,8 @@  int main(int argc, char **argv)
     qtest_add_func("/rtc/basic/bcd-12h", basic_12h_bcd);
     qtest_add_func("/rtc/set-year/20xx", set_year_20xx);
     qtest_add_func("/rtc/set-year/1980", set_year_1980);
-    qtest_add_func("/rtc/register_b_set_flag", register_b_set_flag);
-    qtest_add_func("/rtc/fuzz-registers", fuzz_registers);
+    qtest_add_func("/rtc/misc/register_b_set_flag", register_b_set_flag);
+    qtest_add_func("/rtc/misc/fuzz-registers", fuzz_registers);
     ret = g_test_run();
 
     if (s) {