[PATCH v2] OSStest: explicitly enable building qemu-traditional

Juergen Gross posted 1 patch 2 years, 6 months ago
Failed in applying to current master (apply log)
ts-xen-build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
[PATCH v2] OSStest: explicitly enable building qemu-traditional
Posted by Juergen Gross 2 years, 6 months ago
It is planned to no longer build qemu-traditional per default.

In order to be able to continue running tests with ioemu-stubdom run
configure with --enable-qemu-traditional.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
V2:
- set --enable-qemu-traditional on x86 only (Ian Jackson)
---
 ts-xen-build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ts-xen-build b/ts-xen-build
index af0dd894..fdf55521 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -144,6 +144,7 @@ END
 sub build () {
     my $xend_opt= $r{enable_xend} =~ m/true/ ? "--enable-xend" : "--disable-xend";
     my $ovmf_opt= $r{enable_ovmf} =~ m/true/ ? "--enable-ovmf" : "--disable-ovmf";
+    my $qemutrad_opt = $r{arch} =~ m/amd64|i386/ ? "--enable-qemu-traditional" : "";
 
     my $configure_prefix = $r{cmdprefix_configure} // '';
     my $configure_suffix = $r{cmdsuffix_configure} // '';
@@ -157,8 +158,11 @@ sub build () {
                 if grep -q -- $ovmf_opt tools/configure ; then
                     ovmf=$ovmf_opt
                 fi
+                if grep -q -- $qemutrad_opt tools/configure ; then
+                    qemutrad=$qemutrad_opt
+                fi
 END
-               $configure_prefix ./configure --sysconfdir=/etc \$xend \$ovmf $configure_suffix @configure_args
+               $configure_prefix ./configure --sysconfdir=/etc \$xend \$ovmf \$qemutrad $configure_suffix @configure_args
 END
             fi
 END
-- 
2.26.2


Re: [PATCH v2] OSStest: explicitly enable building qemu-traditional
Posted by Ian Jackson 2 years, 6 months ago
Juergen Gross writes ("[PATCH v2] OSStest: explicitly enable building qemu-traditional"):
> It is planned to no longer build qemu-traditional per default.
> 
> In order to be able to continue running tests with ioemu-stubdom run
> configure with --enable-qemu-traditional.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

Acked-by: Ian Jackson <iwj@xenproject.org>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>

And pushed to osstest pretest.  I will let you know how it goes.

Thanks,
Ian.

Re: [PATCH v2] OSStest: explicitly enable building qemu-traditional
Posted by Ian Jackson 2 years, 6 months ago
Ian Jackson writes ("Re: [PATCH v2] OSStest: explicitly enable building qemu-traditional"):
> Juergen Gross writes ("[PATCH v2] OSStest: explicitly enable building qemu-traditional"):
> > It is planned to no longer build qemu-traditional per default.
> > 
> > In order to be able to continue running tests with ioemu-stubdom run
> > configure with --enable-qemu-traditional.
> > 
> > Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Acked-by: Ian Jackson <iwj@xenproject.org>
> Release-Acked-by: Ian Jackson <iwj@xenproject.org>
> 
> And pushed to osstest pretest.  I will let you know how it goes.

This passed the self-test (so it is in producetion), but, I observe
that it does this[1]:

                   if grep -q --  tools/configure ; then
                       qemutrad=
                   fi
   ...
   + grep -q -- tools/configure

I think this only works because the build has its stdin redirected
from /dev/null.  That's not going to change so it's not a bug but it
seems quite odd and possibly a latent bug.

Thanks,
Ian.

[1]
http://logs.test-lab.xenproject.org/osstest/logs/165863/build-arm64-xsm/6.ts-xen-build.log
http://logs.test-lab.xenproject.org/osstest/logs/165863/build-arm64-xsm/info.html