KVM test: Don't perform workarounds during KVM build

Commit Message

Lucas Meneghel Rodrigues Sept. 2, 2009, 8:52 p.m. UTC

The current KVM build test contains a workaround for
older repository formats: If some roms are not found
under the pc-bios directory, copy them to that directory.

However the workaround might mask a problem on the
build scripts, since one of the purposes of the test
is to verify that the KVM code builds using standard
procedure. So get rid of the workarounds and make sure
all kvm builds are made using the procedure

./configure [options]
make -j (n cpus +1)
make install

Failures mean build scripts failure, and should be
treated as bugs.

Signed-off-by: Lucas Meneghel Rodrigues <[e-mail]>
---
 client/tests/kvm/kvm_install.py |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

Patch

diff --git a/client/tests/kvm/kvm_install.py b/client/tests/kvm/kvm_install.py
index 35aff1d..673445f 100755
--- a/client/tests/kvm/kvm_install.py
+++ b/client/tests/kvm/kvm_install.py
@@ -171,22 +171,7 @@  class SourceDirInstaller:
         # For testing purposes, it's better to build qemu binaries with
         # debugging symbols, so we can extract more meaningful stack traces.
         cfg = "./configure --disable-strip --prefix=%s" % self.prefix
-        if self.repo_type == 1:
-            steps = [cfg, "make clean", "make -j %s" % (utils.count_cpus() + 1)]
-            if not os.path.exists('qemu/pc-bios/bios.bin'):
-                steps.append("make -C bios")
-                steps.append("make -C extboot")
-                steps.append("cp -f bios/BIOS-bochs-latest"
-                             " qemu/pc-bios/bios.bin")
-                steps.append("cp -f vgabios/VGABIOS-lgpl-latest.bin"
-                             " qemu/pc-bios/vgabios.bin")
-                steps.append("cp -f vgabios/VGABIOS-lgpl-latest.cirrus.bin"
-                             " qemu/pc-bios/vgabios-cirrus.bin")
-                steps.append("cp -f extboot/extboot.bin"
-                             " qemu/pc-bios/extboot.bin")
-        elif self.repo_type == 2:
-            steps = [cfg, "make clean", "make -j %s" % utils.count_cpus()]
-
+        steps = [cfg, "make clean", "make -j %s" % (utils.count_cpus() + 1)]
         logging.info("Building KVM")
         for step in steps:
             utils.system(step)