[OSSTEST PATCH 0/3] Fix rump tests for lzma et al

[OSSTEST PATCH 0/3] Fix rump tests for lzma et al

[Ian Jackson]

Between my last series for fixing the rump tests in osstest, xen.git
grew a dependency on liblzma which causese the rump build of the Xen
tools to fail.

Here I fix this by disabling lots of unwanted stuff by passing
appropriate --disable-whatever options to the xen.git configure
script.

I ran an adhoc flight of the rump parts and it all passed.

This series is next in the queue for osstest pretest.

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[OSSTEST PATCH 1/3] ts-xen-build: Support passing arguments to configure

[Ian Jackson]

No functional change with existing callers.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ts-xen-build | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ts-xen-build b/ts-xen-build
index 3e53d74..7dfcda7 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -37,7 +37,15 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
 	die "$_ ?";
     }
 }
+
+my ($dashdashdash) = grep { $ARGV[$_] eq '---' } 0..$#ARGV;
+my (@configure_args, @make_args);
+$dashdashdash //= -1;
+@configure_args = @ARGV[0..$dashdashdash-1];
+@make_args      = @ARGV[$dashdashdash+1..$#ARGV];
+
 # remaining arguments are passed as targets to "make"
+# if there is a ---, those before that are arguments to "configure"
 
 builddirsprops();
 
@@ -126,7 +134,7 @@ sub build () {
                     ovmf=$ovmf_opt
                 fi
 END
-               $configure_prefix ./configure --sysconfdir=/etc \$xend \$ovmf $configure_suffix
+               $configure_prefix ./configure --sysconfdir=/etc \$xend \$ovmf $configure_suffix @configure_args
 END
             fi
 END
@@ -139,7 +147,7 @@ END
 END
 
     buildcmd_stamped_logged(9000, 'xen', 'build', '',<<END,'');
-            $make_prefix make $makeflags @ARGV
+            $make_prefix make $makeflags @make_args
 END
 
     if ($enable_xsm) {
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[OSSTEST PATCH 2/3] rump build tests: Introduce ts-xen-build-rump

[Ian Jackson]

We are going to want to pass a whole slew of options to configure, and
hence to ts-xen-build.  I think putting that in sg-run-job is
undesirable.

So, split out the ts-xen-build invocation into its own script.
Explicitly set the testid so that it does not change.

No significant functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 sg-run-job        | 2 +-
 ts-xen-build-rump | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 ts-xen-build-rump

diff --git a/sg-run-job b/sg-run-job
index 57080e7..104c880 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -501,7 +501,7 @@ proc run-job/build-libvirt {} {
 proc run-job/build-rumprun {} {
     run-ts . = ts-rumprun-build
     run-ts . = ts-rumprun-demo-build + host + nettest rump-test-net
-    run-ts . = ts-xen-build + host --no-kconfig tools
+    run-ts . xen-build ts-xen-build-rump + host --no-kconfig --
     run-ts . = ts-rumprun-bake + host \
         nettest :nettest:/rump-test-net \
         xenstorels ::/usr/local/bin/xenstore-ls
diff --git a/ts-xen-build-rump b/ts-xen-build-rump
new file mode 100755
index 0000000..7ce3e73
--- /dev/null
+++ b/ts-xen-build-rump
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -ex
+
+exec ./ts-xen-build "$@"						\
+	---								\
+	tools
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[OSSTEST PATCH 3/3] rump build tests: Disable a lot of unwanted Xen things at configure time

[Ian Jackson]

Amongst other things, we disable rombios which requires lzma.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ts-xen-build-rump | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ts-xen-build-rump b/ts-xen-build-rump
index 7ce3e73..9ea595b 100755
--- a/ts-xen-build-rump
+++ b/ts-xen-build-rump
@@ -2,5 +2,8 @@
 set -ex
 
 exec ./ts-xen-build "$@"						\
+	--disable-ovmf --disable-seabios --disable-blktap2		\
+	--disable-rombios --disable-qemu-traditional			\
+	--disable-stubdom --disable-xen --disable-docs			\
 	---								\
 	tools
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel