| Message ID | 1540873732-3503-3-git-send-email-liq3ea@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | test: fw_cfg: add reboot-timeout test case | expand |
On 30/10/2018 05:28, Li Qiang wrote: > Signed-off-by: Li Qiang <liq3ea@gmail.com> > --- > tests/fw_cfg-test.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c > index 1c5103fe1c..aeabd17ec0 100644 > --- a/tests/fw_cfg-test.c > +++ b/tests/fw_cfg-test.c > @@ -99,6 +99,15 @@ static void test_fw_cfg_boot_menu(void) > g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), ==, boot_menu); > } > > +static void test_fw_cfg_reboot_timeout(void) > +{ > + uint32_t reboot_timeout; > + > + qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait", > + &reboot_timeout, sizeof(reboot_timeout)); > + g_assert_cmpint(reboot_timeout, <=, 65535); > +} > + > int main(int argc, char **argv) > { > QTestState *s; > @@ -125,6 +134,7 @@ int main(int argc, char **argv) > qtest_add_func("fw_cfg/max_cpus", test_fw_cfg_max_cpus); > qtest_add_func("fw_cfg/numa", test_fw_cfg_numa); > qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu); > + qtest_add_func("fw_cfg/reboot_timeout", test_fw_cfg_reboot_timeout); > > ret = g_test_run(); This test is not doing much; you could add "-boot reboot-timeout=15" and check the value. Paolo
Hi Paolo, Paolo Bonzini <pbonzini@redhat.com> 于2018年10月30日周二 下午6:52写道： > On 30/10/2018 05:28, Li Qiang wrote: > > Signed-off-by: Li Qiang <liq3ea@gmail.com> > > --- > > tests/fw_cfg-test.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c > > index 1c5103fe1c..aeabd17ec0 100644 > > --- a/tests/fw_cfg-test.c > > +++ b/tests/fw_cfg-test.c > > @@ -99,6 +99,15 @@ static void test_fw_cfg_boot_menu(void) > > g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), ==, > boot_menu); > > } > > > > +static void test_fw_cfg_reboot_timeout(void) > > +{ > > + uint32_t reboot_timeout; > > + > > + qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait", > > + &reboot_timeout, sizeof(reboot_timeout)); > > + g_assert_cmpint(reboot_timeout, <=, 65535); > > +} > > + > > int main(int argc, char **argv) > > { > > QTestState *s; > > @@ -125,6 +134,7 @@ int main(int argc, char **argv) > > qtest_add_func("fw_cfg/max_cpus", test_fw_cfg_max_cpus); > > qtest_add_func("fw_cfg/numa", test_fw_cfg_numa); > > qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu); > > + qtest_add_func("fw_cfg/reboot_timeout", test_fw_cfg_reboot_timeout); > > > > ret = g_test_run(); > > This test is not doing much; you could add "-boot reboot-timeout=15" and > check the value. > > This test is for this fix: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg05254.html As the reboot_timeout will be negative. May I add another "-boot reboot-timeout=15" test? Thanks, Li QIang > Paolo > >
diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index 1c5103fe1c..aeabd17ec0 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -99,6 +99,15 @@ static void test_fw_cfg_boot_menu(void) g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), ==, boot_menu); } +static void test_fw_cfg_reboot_timeout(void) +{ + uint32_t reboot_timeout; + + qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait", + &reboot_timeout, sizeof(reboot_timeout)); + g_assert_cmpint(reboot_timeout, <=, 65535); +} + int main(int argc, char **argv) { QTestState *s; @@ -125,6 +134,7 @@ int main(int argc, char **argv) qtest_add_func("fw_cfg/max_cpus", test_fw_cfg_max_cpus); qtest_add_func("fw_cfg/numa", test_fw_cfg_numa); qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu); + qtest_add_func("fw_cfg/reboot_timeout", test_fw_cfg_reboot_timeout); ret = g_test_run();
Signed-off-by: Li Qiang <liq3ea@gmail.com> --- tests/fw_cfg-test.c | 10 ++++++++++ 1 file changed, 10 insertions(+)