Commit 7bd9d0a9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-02-04' into staging 



* Current qtests queue
* Some Kconfig updates
* Some trivial clean-ups here and there

# gpg: Signature made Tue 04 Feb 2020 08:43:28 GMT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2020-02-04:
  configure: Fix typo of the have_afalg variable
  hw/hppa/Kconfig: LASI chipset requires PARALLEL port
  hw/input: Do not enable CONFIG_PCKBD by default
  Makefile: Do not use wildcard hw/*/Kconfig as input for minikconf
  hw/*/Makefile.objs: Move many .o files to common-objs
  trivial: Remove xenfb_enabled from sysemu.h
  include/sysemu/sysemu.h: Remove usused variable no_quit
  gitlab-ci: Refresh the list of iotests
  tests/qtest: update comments about bios-tables-test-allowed-diff.h
  boot-order-test: fix memleaks in boot-order-test
  tests/Makefile: Fix inclusion of the qos dependency files
  docs/devel: Fix qtest paths and info about check-block in testing.rst
  tests/vhost-user-bridge: Fix build
  test-logging: Fix -Werror=maybe-uninitialized warning

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 163b0951 4f67366e

.gitlab-ci.yml

+6 −6
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ build-tcg-disabled: 
 - make check-qapi-schema

 - cd tests/qemu-iotests/

 - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048

            052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160

            163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236

 - ./check -qcow2 028 040 051 056 057 058 065 067 068 082 085 091 095 096 102

            122 124 127 129 132 139 142 144 145 147 151 152 155 157 165 194

            196 197 200 202 203 205 208 209 215 216 218 222 227 234 246 247

            248 250 254 255 256

            052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163

            170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277

 - ./check -qcow2 028 051 056 057 058 065 067 068 082 085 091 095 096 102 122

            124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202

            208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258

            260 261 262 263 264 270 272 273 277 279



build-user:

 script:

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -397,11 +397,11 @@ MINIKCONF_ARGS = \ 
    CONFIG_LINUX=$(CONFIG_LINUX) \

    CONFIG_PVRDMA=$(CONFIG_PVRDMA)



MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig \

                   $(wildcard $(SRC_PATH)/hw/*/Kconfig)

MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig

MINIKCONF_DEPS = $(MINIKCONF_INPUTS) $(wildcard $(SRC_PATH)/hw/*/Kconfig)

MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \



$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_INPUTS) $(BUILD_DIR)/config-host.mak

$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak

	$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@.tmp")

	$(call quiet-command, if test -f $@; then \

	  if cmp -s $@.old $@; then \

configure

+1 −1
Original line number Diff line number Diff line
@@ -5843,7 +5843,7 @@ fi 


##########################################

# check for usable AF_ALG environment

hava_afalg=no

have_afalg=no

cat > $TMPC << EOF

#include <errno.h>

#include <sys/types.h>

docs/devel/testing.rst

+12 −11
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ The usual way to run these tests is: 


  make check



which includes QAPI schema tests, unit tests, and QTests. Different sub-types

of "make check" tests will be explained below.

which includes QAPI schema tests, unit tests, QTests and some iotests.

Different sub-types of "make check" tests will be explained below.



Before running tests, it is best to build QEMU programs first. Some tests

expect the executables to exist and will fail with obscure messages if they
@@ -79,8 +79,8 @@ QTest cases can be executed with 


   make check-qtest



The QTest library is implemented by ``tests/libqtest.c`` and the API is defined

in ``tests/libqtest.h``.

The QTest library is implemented by ``tests/qtest/libqtest.c`` and the API is

defined in ``tests/qtest/libqtest.h``.



Consider adding a new QTest case when you are introducing a new virtual

hardware, or extending one if you are adding functionalities to an existing
@@ -94,20 +94,20 @@ libqos instead of directly calling into libqtest. 
Steps to add a new QTest case are:



1. Create a new source file for the test. (More than one file can be added as

   necessary.) For example, ``tests/test-foo-device.c``.

   necessary.) For example, ``tests/qtest/foo-test.c``.



2. Write the test code with the glib and libqtest/libqos API. See also existing

   tests and the library headers for reference.



3. Register the new test in ``tests/Makefile.include``. Add the test executable

   name to an appropriate ``check-qtest-*-y`` variable. For example:

3. Register the new test in ``tests/qtest/Makefile.include``. Add the test

   executable name to an appropriate ``check-qtest-*-y`` variable. For example:



   ``check-qtest-generic-y = tests/test-foo-device$(EXESUF)``

   ``check-qtest-generic-y = tests/qtest/foo-test$(EXESUF)``



4. Add object dependencies of the executable in the Makefile, including the

   test source file(s) and other interesting objects. For example:



   ``tests/test-foo-device$(EXESUF): tests/test-foo-device.o $(libqos-obj-y)``

   ``tests/qtest/foo-test$(EXESUF): tests/qtest/foo-test.o $(libqos-obj-y)``



Debugging a QTest failure is slightly harder than the unit test because the

tests look up QEMU program names in the environment variables, such as
@@ -152,8 +152,9 @@ parser (either fixing a bug or extending/modifying the syntax). To do this: 
check-block

-----------



``make check-block`` is a legacy command to invoke block layer iotests and is

rarely used. See "QEMU iotests" section below for more information.

``make check-block`` runs a subset of the block layer iotests (the tests that

are in the "auto" group in ``tests/qemu-iotests/group``).

See the "QEMU iotests" section below for more information.



GCC gcov support

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

hw/adc/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
 
common-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o