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

support busybox date.

Browse source 
Busybox date doesn't understand weekdays in -d input,
so strip them beforehand.
This commit is contained in:
Vladimir Serbinenko 2017-01-23 14:31:36 +03:00
parent 37865c2c4a
commit b43b8cacc8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/grub_cmd_date.in
View file

@ -9,7 +9,7 @@ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = sparc64-ieee1275 ];
fi fi
pdt="$(date -u +%s)" pdt="$(date -u +%s)"
dt=`echo date | @builddir@/grub-shell` dt=`echo date | @builddir@/grub-shell | sed 's, [A-Z][a-z]*$,,'`
dtg="$(date -u -d "$dt" +%s)" dtg="$(date -u -d "$dt" +%s)"
ndt="$(date -u +%s)" ndt="$(date -u +%s)"

4
tests/grub_cmd_sleep.in
View file

@ -11,8 +11,8 @@ fi
# Compare RTC with interval timer. # Compare RTC with interval timer.
# Not 100% proper but should check that timer is running ok # Not 100% proper but should check that timer is running ok
dt=`echo 'date; sleep 10; date' | @builddir@/grub-shell` 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 | sed 's, [A-Z][a-z]*$,,')" +%s)"
dt2="$(date -u -d "$(echo "$dt" | tail -n 1)" +%s)" dt2="$(date -u -d "$(echo "$dt" | tail -n 1 | sed 's, [A-Z][a-z]*$,,')" +%s)"
# Ignore QEMU bug # Ignore QEMU bug
if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then