openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 06:01:16 +02:00
Code Issues Releases Wiki Activity

meson: Move programmer test sources into programmer definition

Browse Source 
Move the definition of the programmer test source files into the
dictionary defining the programmers itself. This way there is a better
overview about which of the available programmers have tests and which
don't.

Also, to keep the tests working, iterate over all programmers and add
their test source files to the list of sources that should be built.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
Change-Id: I307faaf8a9f7ae3c54bd96e7d871a3abb8aadea3
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68162
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Singer
2022-10-06 11:00:31 +02:00
parent 3bba710d98
commit 801e7c1674
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -188,6 +188,7 @@ programmer = {
'deps' : [ libusb1 ], 'deps' : [ libusb1 ],
'groups' : [ group_usb, group_external ], 'groups' : [ group_usb, group_external ],
'srcs' : files('dediprog.c', 'usbdev.c'), 'srcs' : files('dediprog.c', 'usbdev.c'),
'test_srcs' : files('tests/dediprog.c'),
'flags' : [ '-DCONFIG_DEDIPROG=1' ], 'flags' : [ '-DCONFIG_DEDIPROG=1' ],
}, },
'developerbox_spi' : { 'developerbox_spi' : {
@ -217,6 +218,7 @@ programmer = {
}, },
'dummy' : { 'dummy' : {
'srcs' : files('dummyflasher.c'), 'srcs' : files('dummyflasher.c'),
'test_srcs' : files('tests/dummyflasher.c'),
'flags' : [ '-DCONFIG_DUMMY=1' ], 'flags' : [ '-DCONFIG_DUMMY=1' ],
}, },
'ft2232_spi' : { 'ft2232_spi' : {
@ -285,6 +287,7 @@ programmer = {
'deps' : [ linux_headers ], 'deps' : [ linux_headers ],
'groups' : [ group_internal ], 'groups' : [ group_internal ],
'srcs' : files('linux_mtd.c'), 'srcs' : files('linux_mtd.c'),
'test_srcs' : files('tests/linux_mtd.c'),
'flags' : [ '-DCONFIG_LINUX_MTD=1' ], 'flags' : [ '-DCONFIG_LINUX_MTD=1' ],
}, },
'linux_spi' : { 'linux_spi' : {
@ -292,6 +295,7 @@ programmer = {
'deps' : [ linux_headers ], 'deps' : [ linux_headers ],
# internal / external? # internal / external?
'srcs' : files('linux_spi.c'), 'srcs' : files('linux_spi.c'),
'test_srcs' : files('tests/linux_spi.c'),
'flags' : [ '-DCONFIG_LINUX_SPI=1' ], 'flags' : [ '-DCONFIG_LINUX_SPI=1' ],
}, },
'parade_lspcon' : { 'parade_lspcon' : {
@ -299,6 +303,7 @@ programmer = {
'deps' : [ linux_headers ], 'deps' : [ linux_headers ],
'groups' : [ group_i2c ], 'groups' : [ group_i2c ],
'srcs' : files('parade_lspcon.c', 'i2c_helper_linux.c'), 'srcs' : files('parade_lspcon.c', 'i2c_helper_linux.c'),
'test_srcs' : files('tests/parade_lspcon.c'),
'flags' : [ '-DCONFIG_PARADE_LSPCON=1' ], 'flags' : [ '-DCONFIG_PARADE_LSPCON=1' ],
'default' : false 'default' : false
}, },
@ -307,6 +312,7 @@ programmer = {
'deps' : [ linux_headers ], 'deps' : [ linux_headers ],
'groups' : [ group_i2c ], 'groups' : [ group_i2c ],
'srcs' : files('mediatek_i2c_spi.c', 'i2c_helper_linux.c'), 'srcs' : files('mediatek_i2c_spi.c', 'i2c_helper_linux.c'),
'test_srcs' : files('tests/mediatek_i2c_spi.c'),
'flags' : [ '-DCONFIG_MEDIATEK_I2C_SPI=1' ], 'flags' : [ '-DCONFIG_MEDIATEK_I2C_SPI=1' ],
'default' : false, 'default' : false,
}, },
@ -362,6 +368,7 @@ programmer = {
'deps' : [ libpci ], 'deps' : [ libpci ],
'groups' : [ group_pci, group_internal ], 'groups' : [ group_pci, group_internal ],
'srcs' : files('nicrealtek.c', 'pcidev.c'), 'srcs' : files('nicrealtek.c', 'pcidev.c'),
'test_srcs' : files('tests/nicrealtek.c'),
'flags' : [ '-DCONFIG_NICREALTEK=1' ], 'flags' : [ '-DCONFIG_NICREALTEK=1' ],
}, },
'ogp_spi' : { 'ogp_spi' : {
@ -387,6 +394,7 @@ programmer = {
'deps' : [ libusb1 ], 'deps' : [ libusb1 ],
'groups' : [ group_usb, group_external ], 'groups' : [ group_usb, group_external ],
'srcs' : files('raiden_debug_spi.c', 'usb_device.c'), 'srcs' : files('raiden_debug_spi.c', 'usb_device.c'),
'test_srcs' : files('tests/raiden_debug_spi.c'),
'flags' : [ '-DCONFIG_RAIDEN_DEBUG_SPI=1' ], 'flags' : [ '-DCONFIG_RAIDEN_DEBUG_SPI=1' ],
}, },
'rayer_spi' : { 'rayer_spi' : {
@ -401,6 +409,7 @@ programmer = {
'deps' : [ linux_headers ], 'deps' : [ linux_headers ],
'groups' : [ group_i2c ], 'groups' : [ group_i2c ],
'srcs' : files('realtek_mst_i2c_spi.c', 'i2c_helper_linux.c'), 'srcs' : files('realtek_mst_i2c_spi.c', 'i2c_helper_linux.c'),
'test_srcs' : files('tests/realtek_mst_i2c_spi.c'),
'flags' : [ '-DCONFIG_REALTEK_MST_I2C_SPI=1' ], 'flags' : [ '-DCONFIG_REALTEK_MST_I2C_SPI=1' ],
'default' : false, 'default' : false,
}, },
@ -447,6 +456,7 @@ foreach p_name, p_data : programmer
'deps' : p_data.get('deps', []), 'deps' : p_data.get('deps', []),
'groups' : p_data.get('groups', []), 'groups' : p_data.get('groups', []),
'srcs' : p_data.get('srcs', []), 'srcs' : p_data.get('srcs', []),
'test_srcs': p_data.get('test_srcs', []),
'flags' : p_data.get('flags', []), 'flags' : p_data.get('flags', []),
'default' : p_data.get('default', true), 'default' : p_data.get('default', true),
} }

13
tests/meson.build
View File

@ -19,15 +19,6 @@ test_srcs = files(
'flashrom.c', 'flashrom.c',
'spi25.c', 'spi25.c',
'lifecycle.c', 'lifecycle.c',
'dummyflasher.c',
'nicrealtek.c',
'raiden_debug_spi.c',
'dediprog.c',
'linux_mtd.c',
'linux_spi.c',
'parade_lspcon.c',
'mediatek_i2c_spi.c',
'realtek_mst_i2c_spi.c',
'layout.c', 'layout.c',
'chip.c', 'chip.c',
'chip_wp.c', 'chip_wp.c',
@ -37,6 +28,10 @@ if not programmer.get('dummy').get('active')
test_srcs += programmer.get('dummy').get('srcs') test_srcs += programmer.get('dummy').get('srcs')
endif endif
foreach p_name, p_data : programmer
test_srcs += p_data.get('test_srcs')
endforeach
mocks = [ mocks = [
'-Wl,--wrap=strdup', '-Wl,--wrap=strdup',
'-Wl,--wrap=physunmap', '-Wl,--wrap=physunmap',