Commit 8c1ecb59 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-280519-2' into staging 



Various testing updates

  - semihosting re-factor (used in system tests)
  - aarch64 and alpha system tests
  - editorconfig tweak for .S
  - some docker image updates
  - iotests clean-up (without make check inclusion)

# gpg: Signature made Tue 28 May 2019 17:26:34 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-next-280519-2: (27 commits)
  tests/qemu-iotests: re-format output to for make check-block
  tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
  Makefile.target: support per-target coverage reports
  Makefile: include per-target build directories in coverage report
  Makefile: fix coverage-report reference to BUILD_DIR
  .travis.yml: enable aarch64-softmmu and alpha-softmmu tcg tests
  tests/tcg/alpha: add system boot.S
  tests/tcg/multiarch: expand system memory test to cover more
  tests/tcg/minilib: support %c format char
  tests/tcg/multiarch: move the system memory test
  tests/tcg/aarch64: add system boot.S
  editorconfig: add settings for .s/.S files
  tests/tcg/multiarch: add hello world system test
  tests/tcg/multiarch: add support for multiarch system tests
  tests/docker: Test more components on the Fedora default image
  tests/docker: add ubuntu 18.04
  MAINTAINERS: update for semihostings new home
  target/mips: convert UHI_plog to use common semihosting code
  target/mips: only build mips-semi for softmmu
  target/arm: correct return values for WRITE/READ in arm-semi
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4a1d38c4 70ff5b07

.editorconfig

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ file_type_emacs = makefile 
indent_style = space

indent_size = 4



[*.{s,S}]

indent_style = tab

indent_size = 8

file_type_emacs = asm



[*.{vert,frag}]

file_type_emacs = glsl

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -284,5 +284,5 @@ matrix: 


    # Run check-tcg against softmmu targets

    - env:

        - CONFIG="--target-list=xtensa-softmmu,arm-softmmu"

        - CONFIG="--target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"

        - TEST_CMD="make -j3 check-tcg V=1"

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ M: Richard Henderson <rth@twiddle.net> 
S: Maintained

F: hw/alpha/

F: hw/isa/smc37c669-superio.c

F: tests/tcg/alpha/system/



ARM Machines

------------
@@ -2563,6 +2564,13 @@ F: docs/pvrdma.txt 
F: contrib/rdmacm-mux/*

F: qapi/rdma.json



Semihosting

M: Alex Bennée <alex.bennee@linaro.org>

L: qemu-devel@nongnu.org

S: Maintained

F: hw/semihosting/

F: include/hw/semihosting/



Build and test automation

-------------------------

Build and test automation

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,9 @@ $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl 
%/coverage-report.html:

	@mkdir -p $*

	$(call quiet-command,\

		gcovr -r $(SRC_PATH) --object-directory $(BUILD_PATH) \

		gcovr -r $(SRC_PATH) \

		$(foreach t, $(TARGET_DIRS), --object-directory $(BUILD_DIR)/$(t)) \

		 --object-directory $(BUILD_DIR) \

		-p --html --html-details -o $@, \

		"GEN", "coverage-report.html")

Makefile.target

+16 −0
Original line number Diff line number Diff line
@@ -238,3 +238,19 @@ endif 


generated-files-y += config-target.h

Makefile: $(generated-files-y)



# Reports/Analysis

#

# The target specific coverage report only cares about target specific

# blobs and not the shared code.

#



%/coverage-report.html:

	@mkdir -p $*

	$(call quiet-command,\

		gcovr -r $(SRC_PATH) --object-directory $(CURDIR) \

		-p --html --html-details -o $@, \

		"GEN", "coverage-report.html")



.PHONY: coverage-report

coverage-report: $(CURDIR)/reports/coverage/coverage-report.html