Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-…
Browse files Browse the repository at this point in the history
…request' into staging

Python queue, 2018-06-15

* Add avocado_qemu: functional/acceptance test infrastructure

# gpg: Signature made Fri 15 Jun 2018 20:12:20 BST
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/python-next-pull-request:
  configure: Enable out-of-tree acceptance tests
  Acceptance tests: add Linux kernel boot and console checking test
  scripts/qemu.py: introduce set_console() method
  Acceptance tests: add quick VNC tests
  scripts/qemu.py: allow adding to the list of extra arguments
  Add functional/acceptance tests infrastructure
  Remove COPYING.PYTHON

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
pm215 committed Jun 19, 2018
2 parents 2ef2f16 + 1b145d5 commit c5ee5cd
Show file tree
Hide file tree
Showing 9 changed files with 494 additions and 274 deletions.
270 changes: 0 additions & 270 deletions COPYING.PYTHON

This file was deleted.

8 changes: 5 additions & 3 deletions configure
Expand Up @@ -7239,9 +7239,11 @@ for rom in seabios vgabios ; do
done

# set up tests data directory
if [ ! -e tests/data ]; then
symlink "$source_path/tests/data" tests/data
fi
for tests_subdir in acceptance data; do
if [ ! -e tests/$tests_subdir ]; then
symlink "$source_path/tests/$tests_subdir" tests/$tests_subdir
fi
done

# set up qemu-iotests in this build directory
iotests_common_env="tests/qemu-iotests/common.env"
Expand Down

0 comments on commit c5ee5cd

Please sign in to comment.