diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-10 13:26:31 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-10 13:26:31 -0600 |
commit | a6308bc2224db238e72c570482717b68246a7ce0 (patch) | |
tree | 28ef7fd1a4d7a4f6ea3ed3037e54eafeeb1aa7da /tests/m48t59-test.c | |
parent | 8757c09f15dcd455f81b4faed73da0d35d7e6b53 (diff) | |
parent | 067f0691277325dcce8401534d2ffc6164305021 (diff) |
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>
Diffstat (limited to 'tests/m48t59-test.c')
-rw-r--r-- | tests/m48t59-test.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/m48t59-test.c b/tests/m48t59-test.c index 5179681ca5..d79f55472d 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); } |