[PATCH 00/39] Next round of Meson fixes and cleanups

Paolo Bonzini posted 39 patches 5 years, 2 months ago
Failed in applying to current master (apply log)
.gitignore                       |   2 -
Makefile                         |  63 ++---
Makefile.objs                    |  34 ---
accel/tcg/meson.build            |   2 +-
configure                        | 331 ++-----------------------
disas/meson.build                |   4 +-
docs/devel/build-system.rst      |  18 +-
hw/arm/meson.build               |   2 +-
hw/riscv/meson.build             |   2 +-
meson.build                      | 135 ++++++++---
monitor/meson.build              |   2 +-
rules.mak                        | 158 ------------
scripts/empty.c                  |   6 +
scripts/grepy.sh                 |   3 -
scripts/mtest2make.py            |  95 ++++----
scripts/ninjatool.py             |   8 +-
scripts/test-driver.py           |  35 +++
tests/Makefile.include           | 405 +------------------------------
tests/benchmark-crypto-cipher.c  |   8 +-
tests/benchmark-crypto-hash.c    |   2 +-
tests/benchmark-crypto-hmac.c    |   8 +-
tests/include/meson.build        |  16 ++
tests/meson.build                | 259 ++++++++++++++++++++
tests/migration/initrd-stress.sh |  10 +
tests/migration/meson.build      |  14 ++
tests/migration/stress.c         |  15 +-
tests/qtest/libqos/meson.build   |   9 +-
tests/tcg/Makefile.qemu          |   2 -
tests/test-crypto-secret.c       |  10 +-
tests/test-qga.c                 |   4 +-
30 files changed, 588 insertions(+), 1074 deletions(-)
delete mode 100644 Makefile.objs
delete mode 100644 rules.mak
create mode 100644 scripts/empty.c
delete mode 100755 scripts/grepy.sh
create mode 100644 scripts/test-driver.py
create mode 100644 tests/include/meson.build
create mode 100755 tests/migration/initrd-stress.sh
create mode 100644 tests/migration/meson.build
[PATCH 00/39] Next round of Meson fixes and cleanups
Posted by Paolo Bonzini 5 years, 2 months ago
This is the final set of patches that I would like to have in 5.2
as far as the Meson conversion is concerned.

Patch 1 is a cross-compilation bugfix from Thomas.

Patches 2..5 rework the "make check" generator so that outputs
of successful tests are hidden, and so that if a test appears
in multiple suites it is not run multiple times by "make check".

Patch 6..10 are miscellaneous bugfixes.

Patches 11..25 convert the check-unit testsuite.

Patches 26..39 remove some of the now-dead code from the configure
script and the Makefile, introducing some simplification whenever symbols
are not needed anymore in the Makefile.

Marc-André Lureau (14):
  meson: build qapi tests library
  meson: declare tasn1 dependency
  meson: declare keyutils dependency
  meson: convert qht-bench
  tests: qga has virtio-serial by default when host has it
  meson: convert the unit tests
  meson: move keyutils dependency check
  meson: remove old socket_scm_helper rule
  meson: convert vhost-user-bridge
  meson: convert atomic*-bench
  tests: do not print benchmark output to stdout
  tests/migration/stress: remove unused exit_success
  meson: fix migration/stress compilation with glibc>=2.30
  meson: convert migration/initrd-stress

Paolo Bonzini (24):
  mtest2make: split environment from test command
  mtest2make: split working directory from test command
  mtest2make: hide output of successful tests
  mtest2make: unify tests that appear in multiple suites
  meson: remove b_lundef option
  configure: do not include absolute paths in -I and -L paths
  configure: include cross sdl2-config in meson cross file
  ninjatool: use constant names for stamp files
  meson: fix libqos linking
  meson: convert the speed tests
  configure: remove dead code for in-tree builds
  meson: compute config_all_devices directly
  Makefile: remove dead variables and includes
  Makefile: inline the relevant parts of rules.mak
  configure: move disassembler configuration to meson
  configure: move C++ compiler handling to meson
  meson: keep all compiler flags detection together
  configure: move -ldl test to meson
  configure: remove unnecessary libm test
  configure: do not look for install(1)
  meson: get glib compilation flags from GLIB_CFLAGS
  configure: do not include dependency flags in QEMU_CFLAGS and LIBS
  configure: drop dead variables
  docs: suggest Meson replacements for various configure functions

Thomas Huth (1):
  configure: Add system = 'linux' for meson when cross-compiling

 .gitignore                       |   2 -
 Makefile                         |  63 ++---
 Makefile.objs                    |  34 ---
 accel/tcg/meson.build            |   2 +-
 configure                        | 331 ++-----------------------
 disas/meson.build                |   4 +-
 docs/devel/build-system.rst      |  18 +-
 hw/arm/meson.build               |   2 +-
 hw/riscv/meson.build             |   2 +-
 meson.build                      | 135 ++++++++---
 monitor/meson.build              |   2 +-
 rules.mak                        | 158 ------------
 scripts/empty.c                  |   6 +
 scripts/grepy.sh                 |   3 -
 scripts/mtest2make.py            |  95 ++++----
 scripts/ninjatool.py             |   8 +-
 scripts/test-driver.py           |  35 +++
 tests/Makefile.include           | 405 +------------------------------
 tests/benchmark-crypto-cipher.c  |   8 +-
 tests/benchmark-crypto-hash.c    |   2 +-
 tests/benchmark-crypto-hmac.c    |   8 +-
 tests/include/meson.build        |  16 ++
 tests/meson.build                | 259 ++++++++++++++++++++
 tests/migration/initrd-stress.sh |  10 +
 tests/migration/meson.build      |  14 ++
 tests/migration/stress.c         |  15 +-
 tests/qtest/libqos/meson.build   |   9 +-
 tests/tcg/Makefile.qemu          |   2 -
 tests/test-crypto-secret.c       |  10 +-
 tests/test-qga.c                 |   4 +-
 30 files changed, 588 insertions(+), 1074 deletions(-)
 delete mode 100644 Makefile.objs
 delete mode 100644 rules.mak
 create mode 100644 scripts/empty.c
 delete mode 100755 scripts/grepy.sh
 create mode 100644 scripts/test-driver.py
 create mode 100644 tests/include/meson.build
 create mode 100755 tests/migration/initrd-stress.sh
 create mode 100644 tests/migration/meson.build

-- 
2.26.2


Re: [PATCH 00/39] Next round of Meson fixes and cleanups
Posted by Marc-André Lureau 5 years, 2 months ago
Hi Paolo

On Wed, Sep 2, 2020 at 5:08 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> This is the final set of patches that I would like to have in 5.2
> as far as the Meson conversion is concerned.
>
> Patch 1 is a cross-compilation bugfix from Thomas.
>
> Patches 2..5 rework the "make check" generator so that outputs
> of successful tests are hidden, and so that if a test appears
> in multiple suites it is not run multiple times by "make check".
>
> Patch 6..10 are miscellaneous bugfixes.
>
> Patches 11..25 convert the check-unit testsuite.
>
> Patches 26..39 remove some of the now-dead code from the configure
> script and the Makefile, introducing some simplification whenever symbols
> are not needed anymore in the Makefile.
>
> Marc-André Lureau (14):
>   meson: build qapi tests library
>   meson: declare tasn1 dependency
>   meson: declare keyutils dependency
>   meson: convert qht-bench
>   tests: qga has virtio-serial by default when host has it
>

When you respin, please drop this patch. While the intention is good
hopefully, it's not actually correct :)

thanks

  meson: convert the unit tests
>   meson: move keyutils dependency check
>   meson: remove old socket_scm_helper rule
>   meson: convert vhost-user-bridge
>   meson: convert atomic*-bench
>   tests: do not print benchmark output to stdout
>   tests/migration/stress: remove unused exit_success
>   meson: fix migration/stress compilation with glibc>=2.30
>   meson: convert migration/initrd-stress
>
> Paolo Bonzini (24):
>   mtest2make: split environment from test command
>   mtest2make: split working directory from test command
>   mtest2make: hide output of successful tests
>   mtest2make: unify tests that appear in multiple suites
>   meson: remove b_lundef option
>   configure: do not include absolute paths in -I and -L paths
>   configure: include cross sdl2-config in meson cross file
>   ninjatool: use constant names for stamp files
>   meson: fix libqos linking
>   meson: convert the speed tests
>   configure: remove dead code for in-tree builds
>   meson: compute config_all_devices directly
>   Makefile: remove dead variables and includes
>   Makefile: inline the relevant parts of rules.mak
>   configure: move disassembler configuration to meson
>   configure: move C++ compiler handling to meson
>   meson: keep all compiler flags detection together
>   configure: move -ldl test to meson
>   configure: remove unnecessary libm test
>   configure: do not look for install(1)
>   meson: get glib compilation flags from GLIB_CFLAGS
>   configure: do not include dependency flags in QEMU_CFLAGS and LIBS
>   configure: drop dead variables
>   docs: suggest Meson replacements for various configure functions
>
> Thomas Huth (1):
>   configure: Add system = 'linux' for meson when cross-compiling
>
>  .gitignore                       |   2 -
>  Makefile                         |  63 ++---
>  Makefile.objs                    |  34 ---
>  accel/tcg/meson.build            |   2 +-
>  configure                        | 331 ++-----------------------
>  disas/meson.build                |   4 +-
>  docs/devel/build-system.rst      |  18 +-
>  hw/arm/meson.build               |   2 +-
>  hw/riscv/meson.build             |   2 +-
>  meson.build                      | 135 ++++++++---
>  monitor/meson.build              |   2 +-
>  rules.mak                        | 158 ------------
>  scripts/empty.c                  |   6 +
>  scripts/grepy.sh                 |   3 -
>  scripts/mtest2make.py            |  95 ++++----
>  scripts/ninjatool.py             |   8 +-
>  scripts/test-driver.py           |  35 +++
>  tests/Makefile.include           | 405 +------------------------------
>  tests/benchmark-crypto-cipher.c  |   8 +-
>  tests/benchmark-crypto-hash.c    |   2 +-
>  tests/benchmark-crypto-hmac.c    |   8 +-
>  tests/include/meson.build        |  16 ++
>  tests/meson.build                | 259 ++++++++++++++++++++
>  tests/migration/initrd-stress.sh |  10 +
>  tests/migration/meson.build      |  14 ++
>  tests/migration/stress.c         |  15 +-
>  tests/qtest/libqos/meson.build   |   9 +-
>  tests/tcg/Makefile.qemu          |   2 -
>  tests/test-crypto-secret.c       |  10 +-
>  tests/test-qga.c                 |   4 +-
>  30 files changed, 588 insertions(+), 1074 deletions(-)
>  delete mode 100644 Makefile.objs
>  delete mode 100644 rules.mak
>  create mode 100644 scripts/empty.c
>  delete mode 100755 scripts/grepy.sh
>  create mode 100644 scripts/test-driver.py
>  create mode 100644 tests/include/meson.build
>  create mode 100755 tests/migration/initrd-stress.sh
>  create mode 100644 tests/migration/meson.build
>
> --
> 2.26.2
>
>
>

-- 
Marc-André Lureau
Re: [PATCH 00/39] Next round of Meson fixes and cleanups
Posted by Paolo Bonzini 5 years, 2 months ago
On 02/09/20 15:14, Marc-André Lureau wrote:
> 
>     Marc-André Lureau (14):
>       meson: build qapi tests library
>       meson: declare tasn1 dependency
>       meson: declare keyutils dependency
>       meson: convert qht-bench
>       tests: qga has virtio-serial by default when host has it
> 
> 
> When you respin, please drop this patch. While the intention is good
> hopefully, it's not actually correct :)
> 
> thanks

Yeah actually I thought I had dropped it already. :)

Paolo