aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-01-10 13:26:31 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-10 13:26:31 -0600
commita6308bc2224db238e72c570482717b68246a7ce0 (patch)
tree28ef7fd1a4d7a4f6ea3ed3037e54eafeeb1aa7da
parent8757c09f15dcd455f81b4faed73da0d35d7e6b53 (diff)
parent067f0691277325dcce8401534d2ffc6164305021 (diff)
downloadqemu-a6308bc2224db238e72c570482717b68246a7ce0.zip
qemu-a6308bc2224db238e72c570482717b68246a7ce0.tar.gz
qemu-a6308bc2224db238e72c570482717b68246a7ce0.tar.bz2
Merge remote-tracking branch 'kraxel/build.1' into staging
* kraxel/build.1: m48t59-test: don't touch watchdog rtc-test: skip year-2038 overflow check in case time_t is 32bit only Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--tests/m48t59-test.c5
-rw-r--r--tests/rtc-test.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/m48t59-test.c b/tests/m48t59-test.c
index 5179681..d79f554 100644
--- a/tests/m48t59-test.c
+++ b/tests/m48t59-test.c
@@ -233,6 +233,11 @@ static void fuzz_registers(void)
reg = (uint8_t)g_test_rand_int_range(0, 16);
val = (uint8_t)g_test_rand_int_range(0, 256);
+ if (reg == 7) {
+ /* watchdog setup register, may trigger system reset, skip */
+ continue;
+ }
+
cmos_write(reg, val);
cmos_read(reg);
}
diff --git a/tests/rtc-test.c b/tests/rtc-test.c
index 02edbf5..e7123ca 100644
--- a/tests/rtc-test.c
+++ b/tests/rtc-test.c
@@ -201,6 +201,10 @@ static void set_year_20xx(void)
g_assert_cmpint(cmos_read(RTC_YEAR), ==, 0x11);
g_assert_cmpint(cmos_read(RTC_CENTURY), ==, 0x20);
+ if (sizeof(time_t) == 4) {
+ return;
+ }
+
/* Set a date in 2080 to ensure there is no year-2038 overflow. */
cmos_write(RTC_REG_A, 0x76);
cmos_write(RTC_YEAR, 0x80);