Commit a1ba62a0 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cleber/tags/python-next-pull-request' into staging 



Python and tests (mostly acceptance) patches 2020-03-17

# gpg: Signature made Wed 18 Mar 2020 00:16:03 GMT
# gpg:                using RSA key 7ABB96EB8B46B94D5E0FE9BB657E8D33A5F209F3
# gpg: Good signature from "Cleber Rosa <crosa@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 7ABB 96EB 8B46 B94D 5E0F  E9BB 657E 8D33 A5F2 09F3

* remotes/cleber/tags/python-next-pull-request:
  tests/docker: make "buildah bud" output similar to "docker build"
  tests/docker: add CentOS 8 Dockerfile
  Acceptance tests: add make targets to download images
  Acceptance test: add "boot_linux" tests
  Acceptance tests: introduce BUILD_DIR and SOURCE_DIR
  python/qemu/qmp.py: QMP debug with VM label

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ce73691e a51d6a54

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ jobs: 
    - name: "GCC check-acceptance"

      dist: bionic

      env:

        - CONFIG="--target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu"

        - CONFIG="--enable-tools --target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu"

        - TEST_CMD="make check-acceptance"

      after_script:

        - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cat

python/qemu/machine.py

+2 −1
Original line number Diff line number Diff line
@@ -270,7 +270,8 @@ class QEMUMachine(object): 
                self._vm_monitor = os.path.join(self._sock_dir,

                                                self._name + "-monitor.sock")

                self._remove_files.append(self._vm_monitor)

            self._qmp = qmp.QEMUMonitorProtocol(self._vm_monitor, server=True)

            self._qmp = qmp.QEMUMonitorProtocol(self._vm_monitor, server=True,

                                                nickname=self._name)



    def _post_launch(self):

        if self._qmp:

python/qemu/qmp.py

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class QEMUMonitorProtocol: 
    #: Logger object for debugging messages

    logger = logging.getLogger('QMP')



    def __init__(self, address, server=False):

    def __init__(self, address, server=False, nickname=None):

        """

        Create a QEMUMonitorProtocol class.
@@ -62,6 +62,9 @@ class QEMUMonitorProtocol: 
        self.__address = address

        self.__sock = self.__get_sock()

        self.__sockfile = None

        self._nickname = nickname

        if self._nickname:

            self.logger = logging.getLogger('QMP').getChild(self._nickname)

        if server:

            self.__sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

            self.__sock.bind(self.__address)

tests/Makefile.include

+18 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ check-help: 
	@echo " $(MAKE) check-venv           Creates a Python venv for tests"

	@echo " $(MAKE) check-clean          Clean the tests and related data"

	@echo

	@echo " $(MAKE) get-vm-images        Downloads all images used by acceptance tests, according to configured targets (~350 MB each, 1.5 GB max)"

	@echo

	@echo

	@echo "The variable SPEED can be set to control the gtester speed setting."

	@echo "Default options are -k and (for $(MAKE) V=1) --verbose; they can be"
@@ -890,7 +892,21 @@ $(TESTS_RESULTS_DIR): 


check-venv: $(TESTS_VENV_DIR)



check-acceptance: check-venv $(TESTS_RESULTS_DIR)

FEDORA_31_ARCHES_CANDIDATES=$(patsubst ppc64,ppc64le,$(TARGETS))

FEDORA_31_ARCHES := x86_64 aarch64 ppc64le s390x

FEDORA_31_DOWNLOAD=$(filter $(FEDORA_31_ARCHES),$(FEDORA_31_ARCHES_CANDIDATES))



# download one specific Fedora 31 image

get-vm-image-fedora-31-%: check-venv

	$(call quiet-command, \

             $(TESTS_VENV_DIR)/bin/python -m avocado vmimage get \

             --distro=fedora --distro-version=31 --arch=$*, \

	"AVOCADO", "Downloading acceptance tests VM image for $*")



# download all vm images, according to defined targets

get-vm-images: check-venv $(patsubst %,get-vm-image-fedora-31-%, $(FEDORA_31_DOWNLOAD))



check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images

	$(call quiet-command, \

            $(TESTS_VENV_DIR)/bin/python -m avocado \

            --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
@@ -901,7 +917,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) 


# Consolidated targets



.PHONY: check-block check-qapi-schema check-qtest check-unit check check-clean

.PHONY: check-block check-qapi-schema check-qtest check-unit check check-clean get-vm-images

check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schema/doc-good.texi

check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))

ifeq ($(CONFIG_TOOLS),y)

tests/acceptance/avocado_qemu/__init__.py

+19 −6
Original line number Diff line number Diff line
@@ -16,8 +16,21 @@ import tempfile 


import avocado



SRC_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..', '..', '..')

sys.path.append(os.path.join(SRC_ROOT_DIR, 'python'))

#: The QEMU build root directory.  It may also be the source directory

#: if building from the source dir, but it's safer to use BUILD_DIR for

#: that purpose.  Be aware that if this code is moved outside of a source

#: and build tree, it will not be accurate.

BUILD_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))



if os.path.islink(os.path.dirname(os.path.dirname(__file__))):

    # The link to the acceptance tests dir in the source code directory

    lnk = os.path.dirname(os.path.dirname(__file__))

    #: The QEMU root source directory

    SOURCE_DIR = os.path.dirname(os.path.dirname(os.readlink(lnk)))

else:

    SOURCE_DIR = BUILD_DIR



sys.path.append(os.path.join(SOURCE_DIR, 'python'))



from qemu.machine import QEMUMachine
@@ -49,10 +62,10 @@ def pick_default_qemu_bin(arch=None): 
    if is_readable_executable_file(qemu_bin_relative_path):

        return qemu_bin_relative_path



    qemu_bin_from_src_dir_path = os.path.join(SRC_ROOT_DIR,

    qemu_bin_from_bld_dir_path = os.path.join(BUILD_DIR,

                                              qemu_bin_relative_path)

    if is_readable_executable_file(qemu_bin_from_src_dir_path):

        return qemu_bin_from_src_dir_path

    if is_readable_executable_file(qemu_bin_from_bld_dir_path):

        return qemu_bin_from_bld_dir_path





def _console_interaction(test, success_message, failure_message,
@@ -153,7 +166,7 @@ class Test(avocado.Test): 
        self.qemu_bin = self.params.get('qemu_bin',

                                        default=default_qemu_bin)

        if self.qemu_bin is None:

            self.cancel("No QEMU binary defined or found in the source tree")

            self.cancel("No QEMU binary defined or found in the build tree")



    def _new_vm(self, *args):

        vm = QEMUMachine(self.qemu_bin, sock_dir=tempfile.mkdtemp())