vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

arm: Ignore qemu clock bug

Browse source
This commit is contained in:
Vladimir Serbinenko 2016-01-08 16:22:47 +01:00
parent 7c6c2ad42c
commit cc2ed41039
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
grub-core/tests/sleep_test.c
View file

@ -33,12 +33,19 @@ sleep_test (void)
{ {
struct grub_datetime st, en; struct grub_datetime st, en;
grub_int32_t stu = 0, enu = 0; grub_int32_t stu = 0, enu = 0;
int is_delayok;
grub_test_assert (!grub_get_datetime (&st), "Couldn't retrieve start time"); grub_test_assert (!grub_get_datetime (&st), "Couldn't retrieve start time");
grub_millisleep (10000); grub_millisleep (10000);
grub_test_assert (!grub_get_datetime (&en), "Couldn't retrieve end time"); grub_test_assert (!grub_get_datetime (&en), "Couldn't retrieve end time");
grub_test_assert (grub_datetime2unixtime (&st, &stu), "Invalid date"); grub_test_assert (grub_datetime2unixtime (&st, &stu), "Invalid date");
grub_test_assert (grub_datetime2unixtime (&en, &enu), "Invalid date"); grub_test_assert (grub_datetime2unixtime (&en, &enu), "Invalid date");
grub_test_assert (enu - stu >= 9 && enu - stu <= 11, "Interval out of range: %d", enu-stu); is_delayok = (enu - stu >= 9 && enu - stu <= 11);
#ifdef __arm__
/* Ignore QEMU bug */
if (enu - stu >= 15 && enu - stu <= 17)
is_delayok = 1;
#endif
grub_test_assert (is_delayok, "Interval out of range: %d", enu-stu);
} }

5
tests/grub_cmd_sleep.in
View file

@ -14,6 +14,11 @@ dt=`echo 'date; sleep 10; date' | @builddir@/grub-shell`
dt1="$(date -u -d "$(echo "$dt" | head -n 1)" +%s)" dt1="$(date -u -d "$(echo "$dt" | head -n 1)" +%s)"
dt2="$(date -u -d "$(echo "$dt" | tail -n 1)" +%s)" dt2="$(date -u -d "$(echo "$dt" | tail -n 1)" +%s)"
# Ignore QEMU bug
if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then
exit 0;
fi
if [ $((dt2 - dt1)) -gt 11 ] || [ $((dt2 - dt1)) -lt 9 ]; then if [ $((dt2 - dt1)) -gt 11 ] || [ $((dt2 - dt1)) -lt 9 ]; then
echo "Interval not in range $dt2-$dt1 != 10" echo "Interval not in range $dt2-$dt1 != 10"
exit 1 exit 1