[Qemu-commits] [qemu/qemu] 1818d5: tests/.gitignore: don't ignore docker tests

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1818d50179b314a833d0d8881a4b36001cc8e189
      
https://github.com/qemu/qemu/commit/1818d50179b314a833d0d8881a4b36001cc8e189
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/.gitignore

  Log Message:
  -----------
  tests/.gitignore: don't ignore docker tests

The .gitignore was being a little over enthusiastic hiding files.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: e043d7321236d753dca7b27779fbed59c5e6ce5d
      
https://github.com/qemu/qemu/commit/e043d7321236d753dca7b27779fbed59c5e6ce5d
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/dockerfiles/debian-tricore-cross.docker

  Log Message:
  -----------
  docker: base debian-tricore on qemu:debian9

We need both git and a working compiler to build the tools. Although
the qemu:debian9 image also has a bunch of extra dependencies it would
be fairly unusual for a user not to already have this layer available
for one of our many other docker images so lets not complicate things.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: be5e1f527abb26414a3b67882669b15649ade593
      
https://github.com/qemu/qemu/commit/be5e1f527abb26414a3b67882669b15649ade593
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/dockerfiles/debian-tricore-cross.docker

  Log Message:
  -----------
  docker: par down QEMU_CONFIGURE_OPTS in debian-tricore-cross

This image isn't going to build anything significant as it is just
intended for building test cases. In case it does end up getting
inadvertently included in a build lets aim for the minimal possible
product.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 43e1b2ffec8cf1741f1ccae56503803d9b8c38d1
      
https://github.com/qemu/qemu/commit/43e1b2ffec8cf1741f1ccae56503803d9b8c38d1
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/docker.py

  Log Message:
  -----------
  docker: fail more gracefully on docker.py check

As this is called directly from the Makefile while determining
dependencies and it is possible the user was configured in one window
but not have credentials in the other. Let's catch the Exceptions and
deal with it quietly.

Signed-off-by: Alex Bennée <address@hidden>
Reported-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: e4ce964d94ee8648c85cbdbe149156d29a4ee53f
      
https://github.com/qemu/qemu/commit/e4ce964d94ee8648c85cbdbe149156d29a4ee53f
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/common.rc

  Log Message:
  -----------
  docker: split configure_qemu from build_qemu

This allows some tests that just want to configure QEMU's source tree
to do so.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 3f9747a73891e50d9c09d2fc3dbba6f1fdd03a13
      
https://github.com/qemu/qemu/commit/3f9747a73891e50d9c09d2fc3dbba6f1fdd03a13
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/common.rc
    M tests/docker/test-clang
    M tests/docker/test-debug
    M tests/docker/test-full
    M tests/docker/test-quick

  Log Message:
  -----------
  docker: move make check into check_qemu helper

Not all docker images can run the check step. Let's move everything
into a common helper so we don't need to replicate checks in the
future.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 56c115a953a17975ce277b719448e02053906124
      
https://github.com/qemu/qemu/commit/56c115a953a17975ce277b719448e02053906124
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/common.rc

  Log Message:
  -----------
  docker: gracefully skip check_qemu

Not all our images are able to run the tests. Rather than use features
we can just check for the existence and run-ability of gtester. If the
image has been setup for binfmt_misc it will be able to run anyway.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 77b08f73c86d2f0f2d3c8e52c568543363658ab9
      
https://github.com/qemu/qemu/commit/77b08f73c86d2f0f2d3c8e52c568543363658ab9
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/Makefile.include

  Log Message:
  -----------
  docker: Makefile.include don't include partial images

Rename DOCKER_INTERMEDIATE_IMAGES to DOCKER_PARTIAL_IMAGES and add the
incomplete cross compiler images that can build tests but can't build
QEMU itself. We also add debian, debian-bootstrap and the tricode
images to the list.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: d984f24c7783a288ce8cc91978521c0c2dc66d9b
      
https://github.com/qemu/qemu/commit/d984f24c7783a288ce8cc91978521c0c2dc66d9b
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    A tests/docker/test-unit

  Log Message:
  -----------
  docker: add test-unit runner

This test doesn't even build QEMU, it just builds and runs all the
unit tests. Intended to make checking unit tests on all docker images
easier.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: ff1a390296ee5a9791d4acf155be0bcf8d922f66
      
https://github.com/qemu/qemu/commit/ff1a390296ee5a9791d4acf155be0bcf8d922f66
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/Makefile.include

  Log Message:
  -----------
  docker: add expansion for docker-test-FOO to Makefile.include

This allows us to run a particular test on all docker images. For
example:

  make docker-test-unit

Will run the unit tests on every supported image. At the same time
rename docker-test to docker-all-tests to be clearer.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 27963460694cdaf5ad757d77e5ec35446b4e8f2d
      
https://github.com/qemu/qemu/commit/27963460694cdaf5ad757d77e5ec35446b4e8f2d
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/Makefile.include

  Log Message:
  -----------
  docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set

The addition of QEMU_TARGET was intended to ensure we fall back to
checking for the existence of an image if the build system was not
currently configured to build it. However this breaks the direct use
of the rule for building custom binfmt_misc images. We already check
for EXECUTABLE so let us just use that as a proxy for deciding if we
are just going to check the image exits.

Signed-off-by: Alex Bennée <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: d19f5fc0411b101798fdfc80b9680df85b316636
      
https://github.com/qemu/qemu/commit/d19f5fc0411b101798fdfc80b9680df85b316636
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/Makefile.include

  Log Message:
  -----------
  docker: report hint when docker.py check fails

When a check fails we currently just report why we failed. This is not
totally helpful to people who want to boot-strap a new image. Report a
hint as to why it failed.

Signed-off-by: Alex Bennée <address@hidden>
Suggested-by: Fam Zheng <address@hidden>


  Commit: 571fef5e07a2398bf14ee1affec3cdbc58088a21
      
https://github.com/qemu/qemu/commit/571fef5e07a2398bf14ee1affec3cdbc58088a21
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/dockerfiles/debian-bootstrap.pre

  Log Message:
  -----------
  docker: Update debootstrap script after Debian migration from Alioth to Salsa

This silents the following warning:

  Cloning into './debootstrap.git'...
  warning: redirecting to 
https://salsa.debian.org/installer-team/debootstrap.git/

See https://lists.debian.org/debian-devel-announce/2018/01/msg00004.html

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>


  Commit: 11cc24a126d3e370c7fc8e6c9be51138713616b5
      
https://github.com/qemu/qemu/commit/11cc24a126d3e370c7fc8e6c9be51138713616b5
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/dockerfiles/debian-bootstrap.docker

  Log Message:
  -----------
  docker: add commentary to debian-bootstrap.docker

This is just a note that later versions of debootstrap don't
technically need this hack.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: f7b446b5defeaa249a18e261879316f27d6c899c
      
https://github.com/qemu/qemu/commit/f7b446b5defeaa249a18e261879316f27d6c899c
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/dockerfiles/debian-bootstrap.pre

  Log Message:
  -----------
  docker: ignore distro versioning of debootstrap

We do a minimum version check for the debootstrap but if the distro
has added their own minor version tick it would fail and fall-back to
the SCM version. This is sub-optimal as the latest/greatest version
may be broken at any one particular time. We fix that with a little
sed magic on the version string before passing to our ugly shell
versioning check.

Signed-off-by: Alex Bennée <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 15352decf8fd834627d05fb619dd523f50101977
      
https://github.com/qemu/qemu/commit/15352decf8fd834627d05fb619dd523f50101977
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/docker/docker.py

  Log Message:
  -----------
  docker: perform basic binfmt_misc validation in docker.py

Setting up binfmt_misc is outside of the scope of the docker.py script
but we can at least validate it with any given executable so we have a
more useful error message than the sed line of deboostrap failing
cryptically.

Signed-off-by: Alex Bennée <address@hidden>
Reported-by: Richard Henderson <address@hidden>


  Commit: 1a3bdc6111482fbb41eacacf850002e4589a81ef
      
https://github.com/qemu/qemu/commit/1a3bdc6111482fbb41eacacf850002e4589a81ef
  Author: Alex Bennée <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/tcg/i386/Makefile.target
    M tests/tcg/i386/README
    R tests/tcg/i386/pi_10.com
    R tests/tcg/i386/runcom.c

  Log Message:
  -----------
  tests/tcg: remove runcom test

The combination of being rather esoteric and needing to support mmap @
0 means this only ever worked under translation. It has now regressed
even further and is no longer useful. Kill it.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 0a7052bb75da47e0d57d7b17b5d467de8589c4a8
      
https://github.com/qemu/qemu/commit/0a7052bb75da47e0d57d7b17b5d467de8589c4a8
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M tests/.gitignore
    M tests/docker/Makefile.include
    M tests/docker/common.rc
    M tests/docker/docker.py
    M tests/docker/dockerfiles/debian-bootstrap.docker
    M tests/docker/dockerfiles/debian-bootstrap.pre
    M tests/docker/dockerfiles/debian-tricore-cross.docker
    M tests/docker/test-clang
    M tests/docker/test-debug
    M tests/docker/test-full
    M tests/docker/test-quick
    A tests/docker/test-unit
    M tests/tcg/i386/Makefile.target
    M tests/tcg/i386/README
    R tests/tcg/i386/pi_10.com
    R tests/tcg/i386/runcom.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/stsquad/tags/pull-docker-fixes-for-3.0-240718-1' into staging

docker fixes & tcg test tweak

  - graceful handling of testing under cross-compile
  - fixes for debootstrap handling
  - more helpful errors (binfmt_misc/EXECUTABLE missing)
  - drop runcom TCG test

# gpg: Signature made Tue 24 Jul 2018 11:48:32 BST
# gpg:                using RSA key FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <address@hidden>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-docker-fixes-for-3.0-240718-1:
  tests/tcg: remove runcom test
  docker: perform basic binfmt_misc validation in docker.py
  docker: ignore distro versioning of debootstrap
  docker: add commentary to debian-bootstrap.docker
  docker: Update debootstrap script after Debian migration from Alioth to Salsa
  docker: report hint when docker.py check fails
  docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set
  docker: add expansion for docker-test-FOO to Makefile.include
  docker: add test-unit runner
  docker: Makefile.include don't include partial images
  docker: gracefully skip check_qemu
  docker: move make check into check_qemu helper
  docker: split configure_qemu from build_qemu
  docker: fail more gracefully on docker.py check
  docker: par down QEMU_CONFIGURE_OPTS in debian-tricore-cross
  docker: base debian-tricore on qemu:debian9
  tests/.gitignore: don't ignore docker tests

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/aabbca41053e...0a7052bb75da
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.