diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 19:33:03 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 19:33:03 -0500 |
| commit | 6a245c666d02210b8461952eccc17379fdeedd9f (patch) | |
| tree | 82e0ea4a8f65ae90c6cdbc6c0efecf4c3416a677 /tests/rtc-test.c | |
| parent | 6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a (diff) | |
| parent | db2d5eba652ecb7420ac4ef79fc747ef391ad0d9 (diff) | |
| download | qemu-6a245c666d02210b8461952eccc17379fdeedd9f.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Lei Li (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
Fix the wrong description in qemu manual
pci_host: Drop write-only address_space field
rng-random: Use qemu_open / qemu_close
configure: Require at least spice-protocol-0.12.3
osdep: replace setsockopt by qemu_setsockopt
lm32: remove unused function
rtc-test: Fix test failures with recent glib
configure: Create link to icon bitmap for out-of-tree builds
Diffstat (limited to 'tests/rtc-test.c')
| -rw-r--r-- | tests/rtc-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rtc-test.c b/tests/rtc-test.c index c5fd042610..9ab583b860 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) { |