Glenn Washburn writes:
> On Sun, 14 Feb 2021 13:58:40 +1100
> Daniel Axtens wrote:
>
>> > Reading more about patchwork, it seems to have its own set of
>> > issues, partly revolving around using a mailing list of development
>> > as we do. see: https://lwn.net/Articles/773456/
>>
>> I'm a
Signed-off-by: Glenn Washburn
---
.ci/build.sh| 66 +++
.ci/functions.gitlab.sh | 30 +
.ci/functions.sh| 30 +
.ci/make-images.sh | 71 +++
.ci/process-tests.sh| 108
.ci/test.sh | 106
.gitlab-ci.yml | 1184
Signed-off-by: Glenn Washburn
---
.ci/build.sh | 10 -
.ci/process-tests.sh | 11 -
.ci/test.sh | 8 -
.gitlab-ci.yml | 552 ---
4 files changed, 581 deletions(-)
diff --git a/.ci/build.sh b/.ci/build.sh
index
Signed-off-by: Glenn Washburn
---
tests/util/grub-shell.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 211bfdb95..332fae704 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -119,7 +119,7 @@
This allows turning on shell tracing when its not practical or not possible
to use commandline arguments. Turn on tracing when the envvar is an integer
greater than 1, since these can log a lot of messages.
Signed-off-by: Glenn Washburn
---
tests/util/grub-fs-tester.in | 2 ++
The current qemu firmware paths for arm-efi and arm64-efi are hardcoded
and not available on Ubuntu/Debian. Make these paths relative and basenames
generic. The idea is that regardless where or what names firmware images
are installed under they can be copied and renamed into a temporary
When running tests there are many invocations of grub-shell, and because the
output files are all random names in the same tmp directory, it becomes more
work to figure out which files went with which grub-shell invocations. So
all generated files from one invocation of grub-shell are put into a
This allows us to test if unexpected output in test scripts is because of a
bug in grub, because there was an error in qemu, or qemu was killed due to a
timeout.
Signed-off-by: Glenn Washburn
---
tests/util/grub-shell.in | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff
Signed-off-by: Glenn Washburn
---
tests/util/grub-shell.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 3b6bce4c2..211bfdb95 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -404,7 +404,9
Signed-off-by: Glenn Washburn
---
tests/util/grub-shell.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 9d8c417da..e80471126 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -211,7 +211,7 @@
Currently, the filesystem timestamp check in grub-fs-tester uses the
squashfs image file's last modified timestamp and checks to see if that
time stamp is within 3 seconds of the superblock timestamp as determined by
grub. The image file's timestamp could be more than 3 seconds off if
mksquashfs
This allows seeing full qemu output of grub-shell, which can be invaluable
when debugging failing tests.
Signed-off-by: Glenn Washburn
---
tests/util/grub-shell.in | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
The previous behavior ignored an error and the output from grub-mkrescue.
This made it a pain to discover that grub-mkrescue was the reason that tests
which rely on grub-shell were failing. Even after discovering grub-mkrescue
was the culprit, there was no output to indicate why it was failing.
Perhaps using a newer UEFI firmware is the reason for the created test disk
showing up as hd2 instead of hd3.
Signed-off-by: Glenn Washburn
---
tests/partmap_test.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/partmap_test.in b/tests/partmap_test.in
index
This will be useful for tests that have unwanted output from setup. This is
not documented because its only intended to be internal at the moment. Also,
--no-trim is allowed to explicitly turn off trim.
Signed-off-by: Glenn Washburn
---
tests/util/grub-shell.in | 14 +-
1 file
When turning on shell tracing the trim line will be output before we
actually want to start the trim. However, in this case the trim line never
starts from the beginning of the line. So start trimming from the correct
line by matching from the beginning of the line.
Signed-off-by: Glenn Washburn
If grub-shell fails, that means that whatever was being tested was not
actually tested. So fail immediately. Sometimes grub-shell is not the last
command in a pipeline of several commands, and in this case the failed error
code can be hidden by a later failing command or hidden when 'set -e' is
LANG must be set to something that supports international characters,
otherwise xorriso will refuse to include the file with name having
international characters, causing the test to fail. So if LANG is not set,
set it to en_US.UTF-8, a very common UTF-8 locale. And if it is set, but
does not look
This patch series is divided into roughly three sections: modifications of
tests, improvements to grub-shell, and the CI patch itself. I have other
improvements to testing coming, but I consider these more essential to the
quality of the CI tests, or highly desirable. Aside from modification of
The macro ELF_R_TYPE does not change the underlying type. Here its argument
is a 64-bit Elf64_Xword. Make sure the format code matches.
For the riscv architecture, rel->r_info could be either Elf32_Xword or
Elf64_Xword depending on if 32 or 64-bit risc is being built. So cast to
64-bit value
Signed-off-by: Glenn Washburn
---
grub-core/disk/cryptodisk.c| 12
grub-core/kern/efi/efi.c | 2 +-
grub-core/loader/efi/chainloader.c | 2 +-
grub-core/loader/i386/bsd.c| 3 ++-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git
Signed-off-by: Glenn Washburn
---
grub-core/loader/i386/pc/linux.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 814988ab9..0bc5d6807 100644
--- a/grub-core/loader/i386/pc/linux.c
+++
This should help prevent format string errorsand thus improve the quality
of error reporting.
Signed-off-by: Glenn Washburn
---
include/grub/err.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/grub/err.h b/include/grub/err.h
index 24ba9f5f5..b08d5d0de 100644
---
Signed-off-by: Glenn Washburn
---
grub-core/fs/hfsplus.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
index 9c4e4c88c..b538f52e0 100644
--- a/grub-core/fs/hfsplus.c
+++ b/grub-core/fs/hfsplus.c
@@ -188,7 +188,8 @@
The format code is for a 32-bit int, but the argument, keyid, is declared as
a 64 bit int. The comment above says keyid is 32-bit. I'm not sure if the
comment or declaration is wrong, so force the display of a 64-bit int for
now.
Signed-off-by: Glenn Washburn
---
grub-core/commands/pgp.c | 2 +-
For some reason PRIuGRUB_UINT64_T is not expanding to llu, but to lu, which
causes the format string check to fail. Use literal and force cast until
this is debugged.
Signed-off-by: Glenn Washburn
---
grub-core/fs/zfs/zfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
This patch series fixes all compile errors due to format string issues on
grub_error. This was tested against nearly all supported platforms
successfully. This is important because earlier versions of these changes
compiled successfully on x86 platforms, but had issues on other ones not
tested.
The grub_error has a format string expecting two arguments, but only one
provided. According to the comments in the struct grub_nv_super definition,
the version field looks like a version number where major.minor is encoded
as each a byte in the two-byte short.
Signed-off-by: Glenn Washburn
---
The second format string argument, GRUB_EFI_MAX_USABLE_ADDRESS, is a macro
to a number literal. However depending on what the target architecture, the
type can be 32 or 64 bits. Cast to a 64-bit integer. Also, change the
format string literals %llx to use PRIxGRUB_UINT64_T.
Signed-off-by: Glenn
Signed-off-by: Glenn Washburn
---
grub-core/disk/ata.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/disk/ata.c b/grub-core/disk/ata.c
index 685f33a19..c8f350ed3 100644
--- a/grub-core/disk/ata.c
+++ b/grub-core/disk/ata.c
@@ -219,7 +219,7 @@
Signed-off-by: Glenn Washburn
---
grub-core/video/bochs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/video/bochs.c b/grub-core/video/bochs.c
index 7a249eb21..30ea1bd82 100644
--- a/grub-core/video/bochs.c
+++ b/grub-core/video/bochs.c
@@ -249,11 +249,11 @@
Its obvious from the error message that the variable named "type" was
accidentally omitted.
Signed-off-by: Glenn Washburn
---
grub-core/parttool/msdospart.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/parttool/msdospart.c b/grub-core/parttool/msdospart.c
Signed-off-by: Glenn Washburn
---
grub-core/loader/efi/chainloader.c | 2 +-
grub-core/net/tftp.c | 2 +-
grub-core/script/lexer.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/loader/efi/chainloader.c
On Sun, 14 Feb 2021 13:58:40 +1100
Daniel Axtens wrote:
> > Reading more about patchwork, it seems to have its own set of
> > issues, partly revolving around using a mailing list of development
> > as we do. see: https://lwn.net/Articles/773456/
>
> I'm a patchwork maintainer, happy to discuss
34 matches
Mail list logo