Patch submitted upstream: https://github.com/robotframework/robotframework/pull/4286. diff --git a/atest/robot/standard_libraries/operating_system/modified_time.robot b/atest/robot/standard_libraries/operating_system/modified_time.robot index d144ffd34..c7681e61d 100644 --- a/atest/robot/standard_libraries/operating_system/modified_time.robot +++ b/atest/robot/standard_libraries/operating_system/modified_time.robot @@ -8,7 +8,7 @@ ${TESTFILE} %{TEMPDIR}${/}robot-os-tests${/}f1.txt *** Test Cases *** Get Modified Time As Timestamp ${tc} = Check Test Case ${TESTNAME} - Should Match Regexp ${tc.kws[0].msgs[0].message} Last modified time of '' is 20\\d\\d-\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d + Should Match Regexp ${tc.kws[0].msgs[0].message} Last modified time of '' is \\d\\d\\d\\d-\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d Get Modified Time As Seconds After Epoch ${tc} = Check Test Case ${TESTNAME} diff --git a/atest/testdata/standard_libraries/builtin/get_time.robot b/atest/testdata/standard_libraries/builtin/get_time.robot index 9847d8c42..24ce732ca 100644 --- a/atest/testdata/standard_libraries/builtin/get_time.robot +++ b/atest/testdata/standard_libraries/builtin/get_time.robot @@ -11,18 +11,18 @@ Get Time As Timestamp Get Time As Seconds After Epoch ${time} = Get Time epoch - Should Be True 1000000000 < ${time} < 2000000000 + Should Be True 0 < ${time} Get Time As Parts @{time} = Get Time year, month, day, hour, min, sec - Should Be True 2000 < ${time}[0] < 2100 + Should Match Regexp ${time}[0] \\d{4} Should Be True 1 <= int('${time}[1]') <= 12 Should Be True 1 <= int('${time}[2]') <= 31 Should Be True 0 <= int('${time}[3]') <= 23 Should Be True 0 <= int('${time}[4]') <= 59 Should Be True 0 <= int('${time}[5]') <= 59 ${year} ${min} ${sec} = Get Time seconds and minutes and year and whatnot - Should Be True 2000 < ${year} < 2100 + Should Match Regexp ${year} \\d{4} Should Be True 0 <= int('${min}') <= 59 Should Be True 0 <= int('${sec}') <= 59 diff --git a/atest/testdata/standard_libraries/operating_system/modified_time.robot b/atest/testdata/standard_libraries/operating_system/modified_time.robot index 9489b3c9c..c712ebaed 100644 --- a/atest/testdata/standard_libraries/operating_system/modified_time.robot +++ b/atest/testdata/standard_libraries/operating_system/modified_time.robot @@ -14,13 +14,13 @@ Get Modified Time As Timestamp Get Modified Time As Seconds After Epoch ${dirtime} = Get Modified Time ${CURDIR} epoch - Should Be True 1000000000 < ${dirtime} < 2000000000 + Should Be True ${dirtime} > 0 ${current} = Get Time epoch Should Be True ${current} >= ${dirtime} Get Modified Time As Parts ${year} = Get Modified Time ${CURDIR} year - Should Be True 2000 < ${year} < 2100 + Should Match Regexp ${year} \\d{4} ${yyyy} ${mm} ${dd} = Get Modified Time ${CURDIR} year, month, day Should Be Equal ${yyyy} ${year} # Must use `int('x')` because otherwise 08 and 09 are considered octal 4-12-01bootloader: grub: Add procedure to share EFI installer code....* gnu/bootloader/grub.scm (make-grub-efi-bootloader): Add procedure. (install-grub-efi, install-grub-efi32): Remove variables. (install-grub-efi-removable): Deprecate variable. Change-Id: Ie10b506bb1088179d459ddafe3229fd730ac45aa Signed-off-by: Ludovic Courtès <ludo@gnu.org> Herman Rimm 2024-11-11bootloader: grub: Remove hardcoded partition number for the Hurd....This supports using another than the default DISK0 PART1 and using LABEL or UUID as root file-system specifier. It still defaults to DISK0 PART1 if the file-system cannot be found, i.e., lives only at the build side: A virtual machine/childhurd build. * gnu/build/file-systems.scm (%hurd-device-spec-regexp, %device-spec-regexp): New variables. (device-name->hurd-device-name, hurd-device-name->device-name, device-spec->device, device-spec->device-name): Use them in new procedures. * gnu/bootloader/grub.scm (make-grub-configuration): Use them to remove hardcoded partition number (root-index 1). Change-Id: I49fa93dacc09883dfb4d695402c5eac2e0e17286 Janneke Nieuwenhuizen 2024-05-22bootloader: Add u-boot-starfive-visionfive2-bootloader....* gnu/bootloader/u-boot.scm (u-boot-starfive-visionfive2-bootloader): New variable. Change-Id: I4b73906fe18d481644102c271f5e0883167b3a50 Zheng Junjie 2024-03-31bootloader: Add u-boot-qemu-riscv64-bootloader....* gnu/bootloader/u-boot.scm (u-boot-qemu-riscv64-bootloader): New variable. Change-Id: If6622838d2250c90a26380849b92387aa7122fbb Signed-off-by: Ludovic Courtès <ludo@gnu.org> Zheng Junjie 2024-01-14bootloader: grub: Add support for loading an additional initrd....In order to be able to provide decryption keys for the LUKS device, they need to be available in the initial ram disk. However they cannot be stored inside the usual initrd, since it is stored in the store and being a world-readable (as files in the store are) is not a desired property for a initrd containing decryption keys. This commit adds an option to load additional initrd during the boot, one that is not stored inside the store and therefore can contain secrets. Since only grub supports encrypted /boot, only grub is modified to use the extra-initrd. There is no use case for the other bootloaders. * doc/guix.texi (Bootloader Configuration): Describe the new extra-initrd field. * gnu/bootloader.scm (<bootloader-configuration>): Add extra-initrd field. * gnu/bootloader/grub.scm (make-grub-configuration): Use the extra-initrd field. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Change-Id: I995989bb623bb594ccdafbf4a1a6de941bd4189f Tomas Volf