On 15/03/2022 20.30, Peter Maydell wrote:
On Tue, 15 Mar 2022 at 18:58, Peter Maydell <peter.mayd...@linaro.org> wrote:
On Tue, 15 Mar 2022 at 11:20, Thomas Huth <th...@redhat.com> wrote:
Hi Peter!
The following changes since commit 352998df1c53b366413690d95b35f76d0721ebed:
Merge tag 'i2c-20220314' of https://github.com/philmd/qemu into staging
(2022-03-14 14:39:33 +0000)
are available in the Git repository at:
https://gitlab.com/thuth/qemu.git tags/pull-request-2022-03-15
for you to fetch changes up to 36149534792dcf07a3c59867f967eaee23ab906c:
meson: Update to version 0.61.3 (2022-03-15 10:32:36 +0100)
----------------------------------------------------------------
* Fixes for s390x branch instruction emulation
* Fixes for the tests/avocado/boot_linux.py:BootLinuxS390X test
* Fix for "-cpu help" output
* Bump meson to 0.61.3 to fix stderr log of the iotests
----------------------------------------------------------------
This results in every "Linking" step on my macos box producing the
warning:
ld: warning: directory not found for option
'-Lns/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/12.0.0'
Obvious suspect here is the new meson version.
Also, after rolling this merge attempt back, older meson barfs
on whatever the new one left behind:
[0/1] Regenerating build files.
Traceback (most recent call last):
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/mesonmain.py",
line 228, in run
return options.run_func(options)
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/msetup.py",
line 281, in run
app.generate()
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/msetup.py",
line 177, in generate
env = environment.Environment(self.source_dir, self.build_dir,
self.options)
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/environment.py",
line 462, in __init__
self.coredata = coredata.load(self.get_build_dir()) # type:
coredata.CoreData
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/coredata.py",
line 1003, in load
obj = pickle.load(f)
File
"/Users/pm215/src/qemu-for-merges/meson/mesonbuild/mesonlib/universal.py",
line 2076, in __setstate__
self.__init__(**state) # type: ignore
TypeError: __init__() got an unexpected keyword argument 'module'
FAILED: build.ninja
/usr/local/opt/python@3.9/bin/python3.9
/Users/pm215/src/qemu-for-merges/meson/meson.py --internal regenerate
/Users/pm215/src/qemu-for-merges
/Users/pm215/src/qemu-for-merges/build/all --backend ninja
ninja: error: rebuilding 'build.ninja': subcommand failed
/usr/local/bin/ninja build.ninja && touch build.ninja.stamp
GIT ui/keycodemapdb meson tests/fp/berkeley-testfloat-3
tests/fp/berkeley-softfloat-3 dtc capstone slirp
[0/1] Regenerating build files.
Traceback (most recent call last):
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/mesonmain.py",
line 228, in run
return options.run_func(options)
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/msetup.py",
line 281, in run
app.generate()
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/msetup.py",
line 177, in generate
env = environment.Environment(self.source_dir, self.build_dir,
self.options)
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/environment.py",
line 462, in __init__
self.coredata = coredata.load(self.get_build_dir()) # type:
coredata.CoreData
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/coredata.py",
line 1003, in load
obj = pickle.load(f)
File
"/Users/pm215/src/qemu-for-merges/meson/mesonbuild/mesonlib/universal.py",
line 2076, in __setstate__
self.__init__(**state) # type: ignore
TypeError: __init__() got an unexpected keyword argument 'module'
FAILED: build.ninja
meson ought to be smart enough to spot that it's got data from an
incompatible version and just discard its cache rather than
choking on it.
Ok, I'll respin without the meson update.
Question is: Do we now want to revert the TAPification of the iotests for
7.0? I guess so, otherwise most people won't see the output of failed tests
when doing "make check-block" ...
Thomas
