X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=qemu-sanity-check.spec.in;h=cc6ca3a02f7de5d13c331df2ba82fc757252ebc7;hb=4b13d9cf4d0d6df54d6eae207258569ccfe0cd3c;hp=94dfa0cad17123738d179c994f5b2d8c4b90dab2;hpb=e708f5e03cfaead43719782d475641f643bd7b6c;p=qemu-sanity-check.git

diff --git a/qemu-sanity-check.spec.in b/qemu-sanity-check.spec.in
index 94dfa0c..cc6ca3a 100644
--- a/qemu-sanity-check.spec.in
+++ b/qemu-sanity-check.spec.in
@@ -16,7 +16,16 @@ BuildRequires:   /usr/bin/perldoc
 BuildRequires:   cpio
 BuildRequires:   glibc-static
 
-%ifarch %{ix86} x86-64
+# BuildRequire these in order to let 'make check' run.  These are
+# not required unless you want to run the tests.  Note don't run the
+# tests on ARM since qemu isn't likely to work.
+%ifarch %{ix86} x86_64
+BuildRequires:   qemu-system-x86
+%endif
+
+BuildRequires:   kernel
+
+%ifarch %{ix86} x86_64
 Requires:        qemu-system-x86
 %endif
 %ifarch armv7hl
@@ -36,12 +45,19 @@ to test the Linux kernel and/or qemu to make sure they are working.
 
 
 %build
-%configure
+# NB: canonical_arch is a variable in the final script, so it
+# has to be escaped here.
+%configure --with-qemu-list="qemu-system-\$canonical_arch"
 make %{?_smp_mflags}
 
 
 %check
-make check
+%ifarch %{ix86} x86_64
+make check || {
+  cat test-suite.log
+  exit 1
+}
+%endif
 
 
 %install