Commit cee35138 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch... 


Merge remote-tracking branch 'remotes/stsquad/tags/pull-code-coverage-and-build-tweaks-050718-3' into staging

Code coverage and other build tweaks

  - revert 208ecb3e (and drop filter for mingw, tweak for check-tcg)
  - some travis speed-ups
  - modernise code coverage support
  - docker image cleanups
  - clean-up binfmt_misc docker infrastructure
  - add debian-powerpc-user-cross image for ppc32 build

# gpg: Signature made Thu 05 Jul 2018 17:00:02 BST
# gpg:                using RSA key FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-code-coverage-and-build-tweaks-050718-3:
  docker: add linux-user powered cross builder for QEMU
  docker: add special rule for deboostrapped images
  docker: add special handling for FROM:debian-%-user targets
  docker: debian-bootstrap.pre allow customising of variant/url
  docker: drop QEMU build-dep from bootstrap
  docker: Do not run tests in 'intermediate' images
  docker: Clean the MXE base image
  docker: ubuntu: Use SDL2
  docker: ubuntu: Update the package list before installing new ones
  linux-user: add gcov support to preexit_cleanup
  linux-user: introduce preexit_cleanup
  build-system: add coverage-report target
  build-system: add clean-coverage target
  travis: add gcovr summary for GCOV build
  docker: add gcovr to travis image
  .gitignore: add .gcov files
  build-system: remove per-test GCOV reporting
  travis: test out-of-tree builds
  travis: do not waste time cloning unused submodules
  Revert "Makefile: Rename TARGET_DIRS to TARGET_LIST"

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents efe26068 19c9a18f

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
.sdk

*.gcda

*.gcno

*.gcov

/pc-bios/bios-pq/status

/pc-bios/vgabios-pq/status

/pc-bios/optionrom/linuxboot.asm

.travis.yml

+11 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ addons: 
      - libvte-2.90-dev

      - sparse

      - uuid-dev

      - gcovr



# The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu

# to prevent IRC notifications from forks. This was created using:
@@ -50,6 +51,8 @@ notifications: 
    on_failure: always

env:

  global:

    - SRC_DIR="."

    - BUILD_DIR="."

    - TEST_CMD="make check"

    - MAKEFLAGS="-j3"

  matrix:
@@ -66,14 +69,17 @@ git: 
before_install:

  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi

  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi

  - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ

  - git submodule update --init --recursive

  - git submodule update --init --recursive capstone dtc ui/keycodemapdb

before_script:

  - ./configure ${CONFIG} || { cat config.log && exit 1; }

  - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}

  - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }

script:

  - make ${MAKEFLAGS} && ${TEST_CMD}

matrix:

  include:

    # Test out-of-tree builds

    - env: CONFIG="--enable-debug --enable-debug-tcg"

           BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."

    # Test with Clang for compile portability (Travis uses clang-5.0)

    - env: CONFIG="--disable-system"

      compiler: clang
@@ -81,6 +87,8 @@ matrix: 
      compiler: clang

    # gprof/gcov are GCC features

    - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"

      after_success:

        - ${SRC_DIR}/scripts/travis/coverage-summary.sh

      compiler: gcc

    # We manually include builds which we disable "make check" for

    - env: CONFIG="--enable-debug --enable-tcg-interpreter"

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2172,6 +2172,7 @@ R: Philippe Mathieu-Daudé <f4bug@amsat.org> 
L: qemu-devel@nongnu.org

S: Maintained

F: .travis.yml

F: scripts/travis/

F: .shippable.yml

F: tests/docker/

F: tests/vm/

Makefile

+34 −10
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ seems to have been used for an in-tree build. You can fix this by running \ 
endif

endif



CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y)

CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y)

CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)

CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)

CONFIG_XEN := $(CONFIG_XEN_BACKEND)

CONFIG_ALL=y

-include config-all-devices.mak
@@ -365,8 +365,8 @@ DOCS= 
endif



SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)

SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST))

SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST))

SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))

SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))



ifeq ($(SUBDIR_DEVICES_MAK),)

config-all-devices.mak:
@@ -469,7 +469,7 @@ config-host.h-timestamp: config-host.mak 
qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")



SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST))

SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))

SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))



$(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
@@ -513,7 +513,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) 
romsubdir-%:

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",)



ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS))

ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))



recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
@@ -723,6 +723,14 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak 
	$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \

	"GEN","$@")



ifdef CONFIG_GCOV

.PHONY: clean-coverage

clean-coverage:

	$(call quiet-command, \

		find . \( -name '*.gcda' -o -name '*.gcov' \) -type f -exec rm {} +, \

		"CLEAN", "coverage files")

endif



clean:

# avoid old build problems by removing potentially incorrect old files

	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
@@ -770,7 +778,7 @@ distclean: clean 
	rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf

	rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html

	rm -f docs/qemu-block-drivers.7

	for d in $(TARGET_LIST); do \

	for d in $(TARGET_DIRS); do \

	rm -rf $$d || exit 1 ; \

        done

	rm -Rf .sdk
@@ -871,7 +879,7 @@ endif 
		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \

	done

	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"

	for d in $(TARGET_LIST); do \

	for d in $(TARGET_DIRS); do \

	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \

        done
@@ -978,6 +986,16 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \ 
    docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \

	docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi



# Reports/Analysis



%/coverage-report.html:

	@mkdir -p $*

	$(call quiet-command,\

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

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



.PHONY: coverage-report

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



ifdef CONFIG_WIN32
@@ -1066,13 +1084,16 @@ endif 
	@echo  '  ctags/TAGS      - Generate tags file for editors'

	@echo  '  cscope          - Generate cscope index'

	@echo  ''

	@$(if $(TARGET_LIST), \

	@$(if $(TARGET_DIRS), \

		echo 'Architecture specific targets:'; \

		$(foreach t, $(TARGET_LIST), \

		$(foreach t, $(TARGET_DIRS), \

		printf "  %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \

		echo '')

	@echo  'Cleaning targets:'

	@echo  '  clean           - Remove most generated files but keep the config'

ifdef CONFIG_GCOV

	@echo  '  clean-coverage  - Remove coverage files'

endif

	@echo  '  distclean       - Remove all generated files'

	@echo  '  dist            - Build a distributable tarball'

	@echo  ''
@@ -1084,6 +1105,9 @@ endif 
	@echo  'Documentation targets:'

	@echo  '  html info pdf txt'

	@echo  '                  - Build documentation in specified format'

ifdef CONFIG_GCOV

	@echo  '  coverage-report - Create code coverage report'

endif

	@echo  ''

ifdef CONFIG_WIN32

	@echo  'Windows targets:'

configure

+1 −1
Original line number Diff line number Diff line
@@ -6212,7 +6212,7 @@ qemu_version=$(head $source_path/VERSION) 
echo "VERSION=$qemu_version" >>$config_host_mak

echo "PKGVERSION=$pkgversion" >>$config_host_mak

echo "SRC_PATH=$source_path" >> $config_host_mak

echo "TARGET_LIST=$target_list" >> $config_host_mak

echo "TARGET_DIRS=$target_list" >> $config_host_mak

if [ "$docs" = "yes" ] ; then

  echo "BUILD_DOCS=yes" >> $config_host_mak

fi