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

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



Python queue, 2019-05-02

* configure: automatically pick python3 is available
  (Daniel P. Berrangé)

* tests/acceptance (Cleber Rosa, Philippe Mathieu-Daudé):
  * Multi-architecture test support
  * Multiple arch-specific boot_linux_console test cases
  * Increase verbosity of avocado by default
  * docstring improvements

# gpg: Signature made Fri 03 May 2019 01:40:06 BST
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/python-next-pull-request:
  configure: automatically pick python3 is available
  tests/boot_linux_console: add a test for alpha + clipper
  tests/boot_linux_console: add a test for s390x + s390-ccw-virtio
  tests/boot_linux_console: add a test for arm + virt
  tests/boot_linux_console: add a test for aarch64 + virt
  tests/boot_linux_console: add a test for mips64el + malta
  tests/boot_linux_console: add a test for mips + malta
  scripts/qemu.py: support adding a console with the default serial device
  tests/boot_linux_console: refactor the console watcher into utility method
  tests/boot_linux_console: increase timeout
  tests/boot_linux_console: add common kernel command line options
  tests/boot_linux_console: update the x86_64 kernel
  tests/boot_linux_console: rename the x86_64 after the arch and machine
  tests/acceptance: look for target architecture in test tags first
  tests/acceptance: use "arch:" tag to filter target specific tests
  tests/acceptance: introduce arch parameter and attribute
  tests/acceptance: fix doc reference to avocado_qemu directory
  tests/acceptance: improve docstring on pick_default_qemu_bin()
  tests/acceptance: show avocado test execution by default

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

# Conflicts:
#	configure
parents 5b396a8c faf44142

.travis.yml

+2 −2
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ matrix: 


    # Acceptance (Functional) tests

    - env:

        - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu"

        - TEST_CMD="make AVOCADO_SHOW=app check-acceptance"

        - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu"

        - TEST_CMD="make check-acceptance"

      addons:

        apt:

          packages:

configure

+15 −3
Original line number Diff line number Diff line
@@ -899,7 +899,18 @@ fi 


: ${make=${MAKE-make}}

: ${install=${INSTALL-install}}

: ${python=${PYTHON-python}}

# We prefer python 3.x. A bare 'python' is traditionally

# python 2.x, but some distros have it as python 3.x, so

# we check that before python2

python=

for binary in "${PYTHON-python3}" python python2

do

    if has "$binary"

    then

        python="$binary"

        break

    fi

done

: ${smbd=${SMBD-/usr/sbin/smbd}}



# Default objcc to clang if available, otherwise use CC
@@ -1823,7 +1834,8 @@ fi 
# Remove old dependency files to make sure that they get properly regenerated

rm -f *-config-devices.mak.d



if ! has $python; then

if test -z "$python"

then

    error_exit "Python not found. Use --python=/path/to/python"

fi

docs/devel/testing.rst

+33 −2
Original line number Diff line number Diff line
@@ -590,8 +590,9 @@ Alternatively, follow the instructions on this link: 
Overview

--------



This directory provides the ``avocado_qemu`` Python module, containing

the ``avocado_qemu.Test`` class.  Here's a simple usage example:

The ``tests/acceptance/avocado_qemu`` directory provides the

``avocado_qemu`` Python module, containing the ``avocado_qemu.Test``

class.  Here's a simple usage example:



.. code::
@@ -726,6 +727,23 @@ vm 
A QEMUMachine instance, initially configured according to the given

``qemu_bin`` parameter.



arch

~~~~



The architecture can be used on different levels of the stack, e.g. by

the framework or by the test itself.  At the framework level, it will

currently influence the selection of a QEMU binary (when one is not

explicitly given).



Tests are also free to use this attribute value, for their own needs.

A test may, for instance, use the same value when selecting the

architecture of a kernel or disk image to boot a VM with.



The ``arch`` attribute will be set to the test parameter of the same

name.  If one is not given explicitly, it will either be set to

``None``, or, if the test is tagged with one (and only one)

``:avocado: tags=arch:VALUE`` tag, it will be set to ``VALUE``.



qemu_bin

~~~~~~~~
@@ -748,6 +766,19 @@ like the following: 


  PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64



arch

~~~~



The architecture that will influence the selection of a QEMU binary

(when one is not explicitly given).



Tests are also free to use this parameter value, for their own needs.

A test may, for instance, use the same value when selecting the

architecture of a kernel or disk image to boot a VM with.



This parameter has a direct relation with the ``arch`` attribute.  If

not given, it will default to None.



qemu_bin

~~~~~~~~

python/qemu/__init__.py

+17 −33
Original line number Diff line number Diff line
@@ -41,17 +41,6 @@ def kvm_available(target_arch=None): 
    return os.access("/dev/kvm", os.R_OK | os.W_OK)





#: Maps machine types to the preferred console device types

CONSOLE_DEV_TYPES = {

    r'^clipper$': 'isa-serial',

    r'^malta': 'isa-serial',

    r'^(pc.*|q35.*|isapc)$': 'isa-serial',

    r'^(40p|powernv|prep)$': 'isa-serial',

    r'^pseries.*': 'spapr-vty',

    r'^s390-ccw-virtio.*': 'sclpconsole',

    }





class QEMUMachineError(Exception):

    """

    Exception called when an error in QEMUMachine happens.
@@ -130,6 +119,7 @@ class QEMUMachine(object): 
        self._temp_dir = None

        self._launched = False

        self._machine = None

        self._console_set = False

        self._console_device_type = None

        self._console_address = None

        self._console_socket = None
@@ -248,13 +238,17 @@ class QEMUMachine(object): 
                '-display', 'none', '-vga', 'none']

        if self._machine is not None:

            args.extend(['-machine', self._machine])

        if self._console_device_type is not None:

        if self._console_set:

            self._console_address = os.path.join(self._temp_dir,

                                                 self._name + "-console.sock")

            chardev = ('socket,id=console,path=%s,server,nowait' %

                       self._console_address)

            args.extend(['-chardev', chardev])

            if self._console_device_type is None:

                args.extend(['-serial', 'chardev:console'])

            else:

                device = '%s,chardev=console' % self._console_device_type

            args.extend(['-chardev', chardev, '-device', device])

                args.extend(['-device', device])

        return args



    def _pre_launch(self):
@@ -480,30 +474,20 @@ class QEMUMachine(object): 
        line.



        This is a convenience method that will either use the provided

        device type, of if not given, it will used the device type set

        on CONSOLE_DEV_TYPES.

        device type, or default to a "-serial chardev:console" command

        line argument.



        The actual setting of command line arguments will be be done at

        machine launch time, as it depends on the temporary directory

        to be created.



        @param device_type: the device type, such as "isa-serial"

        @raises: QEMUMachineAddDeviceError if the device type is not given

                 and can not be determined.

        """

        if device_type is None:

            if self._machine is None:

                raise QEMUMachineAddDeviceError("Can not add a console device:"

                                                " QEMU instance without a "

                                                "defined machine type")

            for regex, device in CONSOLE_DEV_TYPES.items():

                if re.match(regex, self._machine):

                    device_type = device

                    break

            if device_type is None:

                raise QEMUMachineAddDeviceError("Can not add a console device:"

                                                " no matching console device "

                                                "type definition")

        @param device_type: the device type, such as "isa-serial".  If

                            None is given (the default value) a "-serial

                            chardev:console" command line argument will

                            be used instead, resorting to the machine's

                            default device type.

        """

        self._console_set = True

        self._console_device_type = device_type



    @property

tests/Makefile.include

+4 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,8 @@ TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results 
# Controls the output generated by Avocado when running tests.

# Any number of command separated loggers are accepted.  For more

# information please refer to "avocado --help".

AVOCADO_SHOW=none

AVOCADO_SHOW=app

AVOCADO_TAGS=$(patsubst %-softmmu,-t arch:%, $(filter %-softmmu,$(TARGET_DIRS)))



ifneq ($(findstring v2,"v$(PYTHON_VERSION)"),v2)

$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
@@ -1159,6 +1160,8 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) 
	$(call quiet-command, \

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

            --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \

            --filter-by-tags-include-empty --filter-by-tags-include-empty-key \

            $(AVOCADO_TAGS) \

            --failfast=on $(SRC_PATH)/tests/acceptance, \

            "AVOCADO", "tests/acceptance")