Commit 31719c37 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Fam Zheng
Browse files

tests/vm: Add a BaseVM::arch property 



The 'arch' property gives a hint on which architecture the guest image runs.

This can be use to select the correct QEMU binary path.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20181013004034.6968-6-f4bug@amsat.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent f5d3d218

tests/vm/basevm.py

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ class BaseVM(object): 
    BUILD_SCRIPT = ""

    # The guest name, to be overridden by subclasses

    name = "#base"

    # The guest architecture, to be overridden by subclasses

    arch = "#arch"

    def __init__(self, debug=False, vcpus=None):

        self._guest = None

        self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
@@ -151,7 +153,7 @@ class BaseVM(object): 
            "-device", "virtio-blk,drive=drive0,bootindex=0"]

        args += self._data_args + extra_args

        logging.debug("QEMU args: %s", " ".join(args))

        qemu_bin = os.environ.get("QEMU", "qemu-system-x86_64")

        qemu_bin = os.environ.get("QEMU", "qemu-system-" + self.arch)

        guest = QEMUMachine(binary=qemu_bin, args=args)

        try:

            guest.launch()

tests/vm/centos

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import time 


class CentosVM(basevm.BaseVM):

    name = "centos"

    arch = "x86_64"

    BUILD_SCRIPT = """

        set -e;

        cd $(mktemp -d);

tests/vm/freebsd

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import basevm 


class FreeBSDVM(basevm.BaseVM):

    name = "freebsd"

    arch = "x86_64"

    BUILD_SCRIPT = """

        set -e;

        rm -rf /var/tmp/qemu-test.*

tests/vm/netbsd

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import basevm 


class NetBSDVM(basevm.BaseVM):

    name = "netbsd"

    arch = "x86_64"

    BUILD_SCRIPT = """

        set -e;

        rm -rf /var/tmp/qemu-test.*

tests/vm/openbsd

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import basevm 


class OpenBSDVM(basevm.BaseVM):

    name = "openbsd"

    arch = "x86_64"

    BUILD_SCRIPT = """

        set -e;

        rm -rf /var/tmp/qemu-test.*