[Xen-devel] [PATCH OSSTEST 08/12] ts-libvirt-build: run libvirt test suite

[Wei Liu <wei.liu2@xxxxxxxxxx>]

We're interested in xlconfigtest. Since we're running test anyway run
the whole suite.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 ts-libvirt-build | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/ts-libvirt-build b/ts-libvirt-build
index 7322d73..d9db31e 100755
--- a/ts-libvirt-build
+++ b/ts-libvirt-build
@@ -27,6 +27,7 @@ builddirsprops();
 
 our %submodmap = qw(gnulib gnulib);
 our $submodules;
+our $xenprefix;
 
 sub libvirtd_init ();
 
@@ -39,15 +40,6 @@ sub checkout () {
 }
 
 sub config() {
-    my $xenprefix;
-    foreach (qw(/usr/local /usr)) {
-       if (target_file_exists($ho, "$xendist$_/lib/libxenctrl.so")) {
-           $xenprefix="$xendist$_";
-           last;
-       }
-    }
-    die "no xen prefix" unless $xenprefix;
-
     # Uses --no-git because otherwise autogen.sh will undo
     # submodulefixup's attempts to honour
     # revision_libvirt_gnulib. This in turn requires that we specify
@@ -69,7 +61,10 @@ END
 sub build() {
     target_cmd_build($ho, 3600, $builddir, <<END);
         cd libvirt
-        (make $makeflags 2>&1 && touch ../build-ok-stamp) |tee ../log
+        (make $makeflags 2>&1 && \\
+         LD_LIBRARY_PATH=$xenprefix/lib/ \\
+           make check VIR_TEST_EXPENSIVE=1 2>&1 && \\
+         touch ../build-ok-stamp) |tee ../log
         test -f ../build-ok-stamp #/
         echo ok.
 END
@@ -90,6 +85,14 @@ END
 END
 }
 
+foreach (qw(/usr/local /usr)) {
+    if (target_file_exists($ho, "$xendist$_/lib/libxenctrl.so")) {
+       $xenprefix="$xendist$_";
+       last;
+    }
+}
+die "no xen prefix" unless $xenprefix;
+
 checkout();
 config();
 build();
-- 
1.9.1


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