Message ID | 20220824094029.1634519-16-bmeng.cn@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | tests/qtest: Enable running qtest on Windows | expand |
On 24/08/2022 11.39, Bin Meng wrote: > From: Bin Meng <bin.meng@windriver.com> > > There is no tm_gmtoff member in 'struct tm' on Windows. > Update rtc-test.c and m48t59-test.c accordingly. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > --- > > tests/qtest/m48t59-test.c | 2 +- > tests/qtest/rtc-test.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c > index b94a1230f7..843d2ced8e 100644 > --- a/tests/qtest/m48t59-test.c > +++ b/tests/qtest/m48t59-test.c > @@ -137,7 +137,7 @@ static void cmos_get_date_time(QTestState *s, struct tm *date) > date->tm_mday = mday; > date->tm_mon = mon - 1; > date->tm_year = base_year + year - 1900; > -#ifndef __sun__ > +#if !defined(__sun__) && !defined(_WIN32) > date->tm_gmtoff = 0; > #endif > > diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c > index 8126ab1bdb..02ed4e1238 100644 > --- a/tests/qtest/rtc-test.c > +++ b/tests/qtest/rtc-test.c > @@ -111,7 +111,7 @@ static void cmos_get_date_time(struct tm *date) > date->tm_mday = mday; > date->tm_mon = mon - 1; > date->tm_year = base_year + year - 1900; > -#ifndef __sun__ > +#if !defined(__sun__) && !defined(_WIN32) > date->tm_gmtoff = 0; > #endif > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c index b94a1230f7..843d2ced8e 100644 --- a/tests/qtest/m48t59-test.c +++ b/tests/qtest/m48t59-test.c @@ -137,7 +137,7 @@ static void cmos_get_date_time(QTestState *s, struct tm *date) date->tm_mday = mday; date->tm_mon = mon - 1; date->tm_year = base_year + year - 1900; -#ifndef __sun__ +#if !defined(__sun__) && !defined(_WIN32) date->tm_gmtoff = 0; #endif diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c index 8126ab1bdb..02ed4e1238 100644 --- a/tests/qtest/rtc-test.c +++ b/tests/qtest/rtc-test.c @@ -111,7 +111,7 @@ static void cmos_get_date_time(struct tm *date) date->tm_mday = mday; date->tm_mon = mon - 1; date->tm_year = base_year + year - 1900; -#ifndef __sun__ +#if !defined(__sun__) && !defined(_WIN32) date->tm_gmtoff = 0; #endif