From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 3 May 2019 14:26:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a6ae23831b05a11880b40f7d58e332c45a6b04f7;p=qemu.git

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: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	configure
---

a6ae23831b05a11880b40f7d58e332c45a6b04f7
diff --cc configure
index c1e07a97c5,f88011b94d..5b183c2e39
--- a/configure
+++ b/configure
@@@ -1820,11 -1829,9 +1831,12 @@@ EO
  exit 0
  fi
  
 +# Remove old dependency files to make sure that they get properly regenerated
 +rm -f *-config-devices.mak.d
 +
- if ! has $python; then
-   error_exit "Python not found. Use --python=/path/to/python"
+ if test -z "$python"
+ then
+     error_exit "Python not found. Use --python=/path/to/python"
  fi
  
  # Note that if the Python conditional here evaluates True we will exit