Docs & testing patch queue
- Test QAPI firmware.json schema (Thomas) - Handle new env.doc2path() return value (Peter) - Improve how assets are used by some Avocado tests (Cleber) - Remove obsolete check for macOS 10 (Peter) -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmapZuUACgkQ4+MsLN6t wN7oRw//epjJF7PP4e02RqThHWvk92aL6IJiJz6dx8jAVEPWjtY8Pk1jRMhf5ff1 50ICdd3gZVTGENM7gO4arOM61pt1NEXs0Xrh3zDlq+RrRMVhef4LfJh3O3BRqZ7K eVLwo8ismivOJZ2fp+rPY2TT0h4g6zjvJOw7jvXIFM6UFK2C22ff669aa8jhLOVt kI1eRv3yaYbAzWCN7Z4VOZ/VitEk4b50cg0Gbk4ZgpfmYQxn5+ijy0Mekzkh6JE4 G1NzaUnBreqx3dTeE5zUJll42RxwtY6By//NH3r8MLf3twvL61p8DNCkCdRzKOpt SS5GVPyGiESCWY84oVjaSnS0S1Ys/CiNB1a92xvofj1MBIJNSOOmqKl9L7gpom8U D16cmOwK6WQqvzxXhH+Q5tN/cT76de7s1MBSmU4avoxvDWA/4q618TdRXf7I9f0j mEz3K1egX6wz1dd8xquKFoKRkHzPi6h12Rx8D87cRE4E1qbrwulwtkrUCTCNi/cQ nNNfMviyVcWVB7Gx991Bc1JVI1/44TH3O43fm4ZmRFb3JuBiFWxsdNdSrASJNDCq ofW0ZkSgMxgWN7EOpiLBUgTdf7PKS7ITvdUKjKAvY3qlx1Ql491iq050iwPZ336J Byi32D3+yjB9nbWuUW8h9ULgUZ5+3O85SfNEtgiG+YERI0jBWeA= =g7fB -----END PGP SIGNATURE----- Merge tag 'docs-testing-20240731' of https://github.com/philmd/qemu into staging Docs & testing patch queue - Test QAPI firmware.json schema (Thomas) - Handle new env.doc2path() return value (Peter) - Improve how assets are used by some Avocado tests (Cleber) - Remove obsolete check for macOS 10 (Peter) # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmapZuUACgkQ4+MsLN6t # wN7oRw//epjJF7PP4e02RqThHWvk92aL6IJiJz6dx8jAVEPWjtY8Pk1jRMhf5ff1 # 50ICdd3gZVTGENM7gO4arOM61pt1NEXs0Xrh3zDlq+RrRMVhef4LfJh3O3BRqZ7K # eVLwo8ismivOJZ2fp+rPY2TT0h4g6zjvJOw7jvXIFM6UFK2C22ff669aa8jhLOVt # kI1eRv3yaYbAzWCN7Z4VOZ/VitEk4b50cg0Gbk4ZgpfmYQxn5+ijy0Mekzkh6JE4 # G1NzaUnBreqx3dTeE5zUJll42RxwtY6By//NH3r8MLf3twvL61p8DNCkCdRzKOpt # SS5GVPyGiESCWY84oVjaSnS0S1Ys/CiNB1a92xvofj1MBIJNSOOmqKl9L7gpom8U # D16cmOwK6WQqvzxXhH+Q5tN/cT76de7s1MBSmU4avoxvDWA/4q618TdRXf7I9f0j # mEz3K1egX6wz1dd8xquKFoKRkHzPi6h12Rx8D87cRE4E1qbrwulwtkrUCTCNi/cQ # nNNfMviyVcWVB7Gx991Bc1JVI1/44TH3O43fm4ZmRFb3JuBiFWxsdNdSrASJNDCq # ofW0ZkSgMxgWN7EOpiLBUgTdf7PKS7ITvdUKjKAvY3qlx1Ql491iq050iwPZ336J # Byi32D3+yjB9nbWuUW8h9ULgUZ5+3O85SfNEtgiG+YERI0jBWeA= # =g7fB # -----END PGP SIGNATURE----- # gpg: Signature made Wed 31 Jul 2024 08:19:17 AM AEST # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] * tag 'docs-testing-20240731' of https://github.com/philmd/qemu: osdep.h: Clean up no-longer-needed back-compat for macOS 10 tests/avocado: test_arm_emcraft_sf2: handle RW requirements for asset tests/avocado: mips: add hint for fetchasset plugin tests/avocado: mips: fallback to HTTP given certificate expiration docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str docs: add test for firmware.json QAPI Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
commit
9f887c3c8b
@ -99,3 +99,8 @@ if build_docs
|
||||
alias_target('html', sphinxdocs)
|
||||
alias_target('man', sphinxmans)
|
||||
endif
|
||||
|
||||
test('QAPI firmware.json regression tests', qapi_gen,
|
||||
args: ['-o', meson.current_build_dir() / 'qapi',
|
||||
meson.current_source_dir() / 'interop/firmware.json'],
|
||||
suite: ['qapi-schema', 'qapi-interop'])
|
||||
|
||||
@ -19,7 +19,7 @@ __version__ = '1.0'
|
||||
|
||||
def get_infiles(env):
|
||||
for x in env.found_docs:
|
||||
yield env.doc2path(x)
|
||||
yield str(env.doc2path(x))
|
||||
yield from ((os.path.join(env.srcdir, dep)
|
||||
for dep in env.dependencies[x]))
|
||||
for mod in sys.modules.values():
|
||||
|
||||
@ -786,8 +786,7 @@ size_t qemu_get_host_physmem(void);
|
||||
* Toggle write/execute on the pages marked MAP_JIT
|
||||
* for the current thread.
|
||||
*/
|
||||
#if defined(MAC_OS_VERSION_11_0) && \
|
||||
MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
|
||||
#ifdef __APPLE__
|
||||
static inline void qemu_thread_jit_execute(void)
|
||||
{
|
||||
pthread_jit_write_protect_np(true);
|
||||
|
||||
@ -274,8 +274,7 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||
# Wait for VM to shut down gracefully
|
||||
self.vm.wait()
|
||||
|
||||
def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash):
|
||||
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
||||
def do_test_mips_malta32el_nanomips(self, kernel_path_xz):
|
||||
kernel_path = self.workdir + "kernel"
|
||||
with lzma.open(kernel_path_xz, 'rb') as f_in:
|
||||
with open(kernel_path, 'wb') as f_out:
|
||||
@ -299,11 +298,12 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||
:avocado: tags=endian:little
|
||||
:avocado: tags=cpu:I7200
|
||||
"""
|
||||
kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
kernel_url = ('http://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
|
||||
'generic_nano32r6el_page4k.xz')
|
||||
kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6'
|
||||
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
|
||||
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
||||
self.do_test_mips_malta32el_nanomips(kernel_path_xz)
|
||||
|
||||
def test_mips_malta32el_nanomips_16k_up(self):
|
||||
"""
|
||||
@ -312,11 +312,12 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||
:avocado: tags=endian:little
|
||||
:avocado: tags=cpu:I7200
|
||||
"""
|
||||
kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
kernel_url = ('http://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
|
||||
'generic_nano32r6el_page16k_up.xz')
|
||||
kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc'
|
||||
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
|
||||
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
||||
self.do_test_mips_malta32el_nanomips(kernel_path_xz)
|
||||
|
||||
def test_mips_malta32el_nanomips_64k_dbg(self):
|
||||
"""
|
||||
@ -325,11 +326,12 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||
:avocado: tags=endian:little
|
||||
:avocado: tags=cpu:I7200
|
||||
"""
|
||||
kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
kernel_url = ('http://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
|
||||
'generic_nano32r6el_page64k_dbg.xz')
|
||||
kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180'
|
||||
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
|
||||
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
||||
self.do_test_mips_malta32el_nanomips(kernel_path_xz)
|
||||
|
||||
def test_aarch64_xlnx_versal_virt(self):
|
||||
"""
|
||||
@ -399,14 +401,16 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||
'fe371d32e50ca682391e1e70ab98c2942aeffb01/spi.bin')
|
||||
spi_hash = '65523a1835949b6f4553be96dec1b6a38fb05501'
|
||||
spi_path = self.fetch_asset(spi_url, asset_hash=spi_hash)
|
||||
spi_path_rw = os.path.join(self.workdir, os.path.basename(spi_path))
|
||||
shutil.copy(spi_path, spi_path_rw)
|
||||
|
||||
file_truncate(spi_path, 16 << 20) # Spansion S25FL128SDPBHICO is 16 MiB
|
||||
file_truncate(spi_path_rw, 16 << 20) # Spansion S25FL128SDPBHICO is 16 MiB
|
||||
|
||||
self.vm.set_console()
|
||||
kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
|
||||
self.vm.add_args('-kernel', uboot_path,
|
||||
'-append', kernel_command_line,
|
||||
'-drive', 'file=' + spi_path + ',if=mtd,format=raw',
|
||||
'-drive', 'file=' + spi_path_rw + ',if=mtd,format=raw',
|
||||
'-no-reboot')
|
||||
self.vm.launch()
|
||||
self.wait_for_console_pattern('Enter \'help\' for a list')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user