From b43b8cacc813c2c15347de1e35cc88d9aa912d22 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:31:36 +0300 Subject: [PATCH 004/194] support busybox date. Busybox date doesn't understand weekdays in -d input, so strip them beforehand. --- tests/grub_cmd_date.in | 2 +- tests/grub_cmd_sleep.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in index 0d8162e98..60f039ebc 100644 --- a/tests/grub_cmd_date.in +++ b/tests/grub_cmd_date.in @@ -9,7 +9,7 @@ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = sparc64-ieee1275 ]; fi 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)" ndt="$(date -u +%s)" diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in index 05b8f6b73..ac51d4209 100644 --- a/tests/grub_cmd_sleep.in +++ b/tests/grub_cmd_sleep.in @@ -11,8 +11,8 @@ fi # Compare RTC with interval timer. # Not 100% proper but should check that timer is running ok dt=`echo 'date; sleep 10; date' | @builddir@/grub-shell` -dt1="$(date -u -d "$(echo "$dt" | head -n 1)" +%s)" -dt2="$(date -u -d "$(echo "$dt" | tail -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 | sed 's, [A-Z][a-z]*$,,')" +%s)" # Ignore QEMU bug if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then -- 2.13.5