From patchwork Wed Sep 2 20:52:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 45259 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n82Kqd8g010674 for ; Wed, 2 Sep 2009 20:52:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753287AbZIBUwe (ORCPT ); Wed, 2 Sep 2009 16:52:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753251AbZIBUwe (ORCPT ); Wed, 2 Sep 2009 16:52:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8568 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753132AbZIBUwe (ORCPT ); Wed, 2 Sep 2009 16:52:34 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n82KqZOm016348; Wed, 2 Sep 2009 16:52:35 -0400 Received: from localhost.localdomain (vpn-10-21.bos.redhat.com [10.16.10.21]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n82KqX0D032650; Wed, 2 Sep 2009 16:52:34 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Don't perform workarounds during KVM build Date: Wed, 2 Sep 2009 17:52:32 -0300 Message-Id: <1251924752-15686-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 --- client/tests/kvm/kvm_install.py | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) 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)