mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Testing patches

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEEUAN8t5cGD3bwIa1WyjViTGqRccYFAlrLE6oQHGZhbXpAcmVk
 aGF0LmNvbQAKCRDKNWJMapFxxnsTB/sFmoA6QWmvCXHHxmBR5AcfcUmeYoy3Nnzj
 XygC8E7Vfw384XmKY/9jpLEyvgmP+YyXgikkFqFv6hL4gj+oGOpro4pv6lePuiwN
 ksQTx7RFekBOkz/FWopA8mxJudfocidzYLgL6Pdj2tE5SmAykRtYGX8yD8GbsmPs
 beZaZvrHVL013RFhlqprVflQobQMazodYrTK0pLFrwymFU/7WYr/1HQ40SM9EGMK
 DAn4c3l1xsyT4Vs0Y4Ev5lZKp1RMuveY/TRhN6stX4huRACq13fHw96dJK8DE6dR
 YA4q2UhxBJ8rRlIcwhaKchOcAzOfV69yQ7cYVUmdX/ILGwNrw6yM
 =Tkey
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging

Testing patches

# gpg: Signature made Mon 09 Apr 2018 08:18:02 BST
# gpg:                using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/testing-pull-request:
  docker: fedora: test more components
  docker: Inline "prep_fail" in run script
  tests: Fix ubuntu.i386 image initialization
  docker: dump 'config.log' if ./configure fails

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-04-09 10:21:14 +01:00
commit 2a6bcfdebe
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/docker/common.rc
View File

@ -30,7 +30,9 @@ build_qemu()
$@"
echo "Configure options:"
echo $config_opts
$QEMU_SRC/configure $config_opts && make $MAKEFLAGS
$QEMU_SRC/configure $config_opts || \
{ cat config.log && test_fail "Failed to run 'configure'"; }
make $MAKEFLAGS
}
test_fail()

13
tests/docker/dockerfiles/fedora.docker
View File

@ -1,9 +1,16 @@
FROM fedora:27
ENV PACKAGES \
ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \
glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \
nettle-devel libasan libubsan \
gcc gcc-c++ llvm clang make perl which bc findutils glib2-devel \
libaio-devel pixman-devel zlib-devel libfdt-devel libasan libubsan \
bluez-libs-devel brlapi-devel bzip2-devel \
device-mapper-multipath-devel glusterfs-api-devel gnutls-devel \
gtk3-devel libattr-devel libcap-devel libcap-ng-devel libcurl-devel \
libjpeg-devel libpng-devel librbd-devel libssh2-devel libusbx-devel \
libxml2-devel lzo-devel ncurses-devel nettle-devel nss-devel \
numactl-devel SDL2-devel snappy-devel spice-server-devel \
systemtap-sdt-devel usbredir-devel virglrenderer-devel vte3-devel \
xen-devel \
mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \

2
tests/docker/run
View File

@ -29,7 +29,7 @@ export TEST_DIR=/tmp/qemu-test
mkdir -p $TEST_DIR/{src,build,install}
# Extract the source tarballs
tar -C $TEST_DIR/src -xf $BASE/qemu.tar || prep_fail "Failed to untar source"
tar -C $TEST_DIR/src -xf $BASE/qemu.tar || { echo "Failed to untar source"; exit 2; }
if test -f $TEST_DIR/src/Makefile; then
export FEATURES="$FEATURES dtc"
fi

5
tests/vm/basevm.py
View File

@ -107,10 +107,7 @@ class BaseVM(object):
assert not isinstance(cmd, str)
ssh_cmd += ["%s@127.0.0.1" % user] + list(cmd)
logging.debug("ssh_cmd: %s", " ".join(ssh_cmd))
r = subprocess.call(ssh_cmd,
stdin=sys.stdin if interactive else self._devnull,
stdout=sys.stdout if interactive else self._stdout,
stderr=sys.stderr if interactive else self._stderr)
r = subprocess.call(ssh_cmd)
if check and r != 0:
raise Exception("SSH command failed: %s" % cmd)
return r