qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH 2/2] m48t59-test: don't touch watchdog
  2013-01-07 14:11 [Qemu-devel] [PATCH 0/2] fix tests Gerd Hoffmann
@ 2013-01-07 14:11 ` Gerd Hoffmann
  0 siblings, 0 replies; 7+ messages in thread
From: Gerd Hoffmann @ 2013-01-07 14:11 UTC (permalink / raw)
  To: qemu-devel; +Cc: Gerd Hoffmann

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 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);
     }
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Qemu-devel] [PULL 0/2] two little testcase fixes
@ 2013-01-10 14:49 Gerd Hoffmann
  2013-01-10 14:49 ` [Qemu-devel] [PATCH 1/2] rtc-test: skip year-2038 overflow check in case time_t is 32bit only Gerd Hoffmann
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Gerd Hoffmann @ 2013-01-10 14:49 UTC (permalink / raw)
  To: qemu-devel; +Cc: Gerd Hoffmann

  Hi,

Two test case fixes so "make check" works.

please pull,
  Gerd

The following changes since commit 7cd5da7eef152a533c5774effd2e7bbfa5976c86:

  Merge remote-tracking branch 'mdroth/qga-pull-1-8-2013' into staging (2013-01-09 09:55:51 -0600)

are available in the git repository at:

  git://git.kraxel.org/qemu build.1

Gerd Hoffmann (2):
      rtc-test: skip year-2038 overflow check in case time_t is 32bit only
      m48t59-test: don't touch watchdog

 tests/m48t59-test.c |    5 +++++
 tests/rtc-test.c    |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Qemu-devel] [PATCH 1/2] rtc-test: skip year-2038 overflow check in case time_t is 32bit only
  2013-01-10 14:49 [Qemu-devel] [PULL 0/2] two little testcase fixes Gerd Hoffmann
@ 2013-01-10 14:49 ` Gerd Hoffmann
  2013-01-10 15:03   ` Andreas Färber
  2013-01-10 14:49 ` [Qemu-devel] [PATCH 2/2] m48t59-test: don't touch watchdog Gerd Hoffmann
  2013-01-10 20:57 ` [Qemu-devel] [PULL 0/2] two little testcase fixes Anthony Liguori
  2 siblings, 1 reply; 7+ messages in thread
From: Gerd Hoffmann @ 2013-01-10 14:49 UTC (permalink / raw)
  To: qemu-devel; +Cc: Gerd Hoffmann

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/rtc-test.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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);
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Qemu-devel] [PATCH 2/2] m48t59-test: don't touch watchdog
  2013-01-10 14:49 [Qemu-devel] [PULL 0/2] two little testcase fixes Gerd Hoffmann
  2013-01-10 14:49 ` [Qemu-devel] [PATCH 1/2] rtc-test: skip year-2038 overflow check in case time_t is 32bit only Gerd Hoffmann
@ 2013-01-10 14:49 ` Gerd Hoffmann
  2013-01-10 20:57 ` [Qemu-devel] [PULL 0/2] two little testcase fixes Anthony Liguori
  2 siblings, 0 replies; 7+ messages in thread
From: Gerd Hoffmann @ 2013-01-10 14:49 UTC (permalink / raw)
  To: qemu-devel; +Cc: Gerd Hoffmann

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 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);
     }
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [Qemu-devel] [PATCH 1/2] rtc-test: skip year-2038 overflow check in case time_t is 32bit only
  2013-01-10 14:49 ` [Qemu-devel] [PATCH 1/2] rtc-test: skip year-2038 overflow check in case time_t is 32bit only Gerd Hoffmann
@ 2013-01-10 15:03   ` Andreas Färber
  2013-01-11  7:55     ` Gerd Hoffmann
  0 siblings, 1 reply; 7+ messages in thread
From: Andreas Färber @ 2013-01-10 15:03 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: qemu-devel

Am 10.01.2013 15:49, schrieb Gerd Hoffmann:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Where did my Reviewed-by go? :)

Andreas

> ---
>  tests/rtc-test.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> 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);
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Qemu-devel] [PULL 0/2] two little testcase fixes
  2013-01-10 14:49 [Qemu-devel] [PULL 0/2] two little testcase fixes Gerd Hoffmann
  2013-01-10 14:49 ` [Qemu-devel] [PATCH 1/2] rtc-test: skip year-2038 overflow check in case time_t is 32bit only Gerd Hoffmann
  2013-01-10 14:49 ` [Qemu-devel] [PATCH 2/2] m48t59-test: don't touch watchdog Gerd Hoffmann
@ 2013-01-10 20:57 ` Anthony Liguori
  2 siblings, 0 replies; 7+ messages in thread
From: Anthony Liguori @ 2013-01-10 20:57 UTC (permalink / raw)
  To: Gerd Hoffmann, qemu-devel

Pulled, thanks.

N.B.  This note may be extraneous because the pull request was sent by a
version of git older than 1.7.9 making the pull request ambigious.  Please
consider upgrading to a newer version of git.

Regards,

Anthony Liguori

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Qemu-devel] [PATCH 1/2] rtc-test: skip year-2038 overflow check in case time_t is 32bit only
  2013-01-10 15:03   ` Andreas Färber
@ 2013-01-11  7:55     ` Gerd Hoffmann
  0 siblings, 0 replies; 7+ messages in thread
From: Gerd Hoffmann @ 2013-01-11  7:55 UTC (permalink / raw)
  To: Andreas Färber; +Cc: qemu-devel

On 01/10/13 16:03, Andreas Färber wrote:
> Am 10.01.2013 15:49, schrieb Gerd Hoffmann:
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> 
> Where did my Reviewed-by go? :)

Anyone happens to have a script to pick up those?

thanks,
  Gerd

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-01-11  7:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-10 14:49 [Qemu-devel] [PULL 0/2] two little testcase fixes Gerd Hoffmann
2013-01-10 14:49 ` [Qemu-devel] [PATCH 1/2] rtc-test: skip year-2038 overflow check in case time_t is 32bit only Gerd Hoffmann
2013-01-10 15:03   ` Andreas Färber
2013-01-11  7:55     ` Gerd Hoffmann
2013-01-10 14:49 ` [Qemu-devel] [PATCH 2/2] m48t59-test: don't touch watchdog Gerd Hoffmann
2013-01-10 20:57 ` [Qemu-devel] [PULL 0/2] two little testcase fixes Anthony Liguori
  -- strict thread matches above, loose matches on Subject: below --
2013-01-07 14:11 [Qemu-devel] [PATCH 0/2] fix tests Gerd Hoffmann
2013-01-07 14:11 ` [Qemu-devel] [PATCH 2/2] m48t59-test: don't touch watchdog Gerd Hoffmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).