From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 27 Feb 2013 00:31:32 +0000 (-0500)
Subject: rtc-test: Fix test failures with recent glib
X-Git-Tag: v1.4.1~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3b81e01b894f03b03db99804da89068064b3ad8;p=thirdparty%2Fqemu.git

rtc-test: Fix test failures with recent glib

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>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit eeb29fb9aa733f97d85857c210d6580a92a1b532)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/tests/rtc-test.c b/tests/rtc-test.c
index 203c0fc363b..2441dcf498a 100644
--- a/tests/rtc-test.c
+++ b/tests/rtc-test.c
@@ -387,8 +387,8 @@ int main(int argc, char **argv)
     qtest_add_func("/rtc/alarm-time", alarm_time);
     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) {