| Message ID | 20240305164623.379149-23-andrew.jones@linux.dev (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: EFI improvements | expand |
On 3/6/24 00:46, Andrew Jones wrote: > The purpose of the _NO_FILE_4Uhere_ kernel is to check that all the > QEMU command line options that have been pulled together by the > scripts will work. Since booting with UEFI and the -kernel command > line is supported by QEMU, then we don't need to create a dummy > test for _NO_FILE_4Uhere_ and go all the way into UEFI's shell and > execute it to prove the command line is OK, since we would have > failed much before all that if it wasn't. Just run QEMU "normally", > i.e. no EFI_RUN=y, but add the UEFI -bios and its file system command > line options, in order to check the full command line. It should absolutely accelerate the speed of efi tests. > > Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com> > Signed-off-by: Andrew Jones <andrew.jones@linux.dev> Reviewed-by: Shaoqin Huang <shahuang@redhat.com> > --- > arm/efi/run | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arm/efi/run b/arm/efi/run > index 6872c337c945..e629abde5273 100755 > --- a/arm/efi/run > +++ b/arm/efi/run > @@ -53,7 +53,14 @@ while (( "$#" )); do > done > > if [ "$EFI_CASE" = "_NO_FILE_4Uhere_" ]; then > - EFI_CASE=dummy > + EFI_CASE_DIR="$EFI_TEST/dummy" > + mkdir -p "$EFI_CASE_DIR" > + $TEST_DIR/run \ > + $EFI_CASE \ > + -bios "$EFI_UEFI" \ > + -drive file.dir="$EFI_CASE_DIR/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \ > + "${qemu_args[@]}" > + exit > fi > > : "${EFI_CASE_DIR:="$EFI_TEST/$EFI_CASE"}"
diff --git a/arm/efi/run b/arm/efi/run index 6872c337c945..e629abde5273 100755 --- a/arm/efi/run +++ b/arm/efi/run @@ -53,7 +53,14 @@ while (( "$#" )); do done if [ "$EFI_CASE" = "_NO_FILE_4Uhere_" ]; then - EFI_CASE=dummy + EFI_CASE_DIR="$EFI_TEST/dummy" + mkdir -p "$EFI_CASE_DIR" + $TEST_DIR/run \ + $EFI_CASE \ + -bios "$EFI_UEFI" \ + -drive file.dir="$EFI_CASE_DIR/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \ + "${qemu_args[@]}" + exit fi : "${EFI_CASE_DIR:="$EFI_TEST/$EFI_CASE"}"