colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build,meson: Fix udev rules and keyfiles tests

Browse Source 
The port to the meson build system a set of defines were lost, that
made the udev rules and the keyfiles tests to not run properly.

This has been changed so defines are now in their proper place and
tests are run properly.

Fixes #537
This commit is contained in:
Iñigo Martínez
2022-03-27 00:02:23 +01:00
parent 1fdc3ac703
commit 0bc0831b22
2 changed files with 94 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@@ -353,6 +353,7 @@ foreach plugin_name, plugin_reqs: plugins_options_reqs
break break
endif endif
endforeach endforeach
config_h.set('ENABLE_PLUGIN_' + plugin_name.underscorify().to_upper(), true)
endif endif
plugins_options += {plugin_name: plugin_enabled} plugins_options += {plugin_name: plugin_enabled}
endforeach endforeach

200
plugins/meson.build
View File

@@ -34,6 +34,8 @@ libmm_test_common_dep = declare_dependency(
plugins = {} plugins = {}
plugins_data = [] plugins_data = []
plugins_udev_rules = [] plugins_udev_rules = []
plugins_test_udev_rules_dir_c_args = []
plugins_test_keyfile_c_args = []
# never include static libs as deps when building # never include static libs as deps when building
# plugins or shared utils modules # plugins or shared utils modules
@@ -264,14 +266,12 @@ endif
# plugin: broadmobi # plugin: broadmobi
if plugins_options['broadmobi'] if plugins_options['broadmobi']
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_BROADMOBI="@0@"'.format(plugins_dir / 'broadmobi')]
'-DMM_MODULE_NAME="broadmobi"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_BROADMOBI="@0@"'.format(plugins_dir / 'broadmobi'),
]
plugins += {'plugin-broadmobi': { plugins += {'plugin-broadmobi': {
'plugin': true, 'plugin': true,
'module': {'sources': files('broadmobi/mm-plugin-broadmobi.c'), 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': files('broadmobi/mm-plugin-broadmobi.c'), 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="broadmobi"']},
}} }}
plugins_udev_rules += files('broadmobi/77-mm-broadmobi-port-types.rules') plugins_udev_rules += files('broadmobi/77-mm-broadmobi-port-types.rules')
@@ -279,10 +279,10 @@ endif
# plugin: cinterion (previously siemens) # plugin: cinterion (previously siemens)
if plugins_options['cinterion'] if plugins_options['cinterion']
common_c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_CINTERION="@0@"'.format(plugins_dir / 'cinterion')]
'-DMM_MODULE_NAME="cinterion"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_CINTERION="@0@"'.format(plugins_dir / 'cinterion'),
] common_c_args = test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="cinterion"']
sources = files( sources = files(
'cinterion/mm-broadband-bearer-cinterion.c', 'cinterion/mm-broadband-bearer-cinterion.c',
@@ -311,6 +311,9 @@ endif
# plugin: dell # plugin: dell
if plugins_options['dell'] if plugins_options['dell']
test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_DELL="@0@"'.format(plugins_dir / 'dell')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
incs = plugins_incs + [ incs = plugins_incs + [
foxconn_inc, foxconn_inc,
novatel_inc, novatel_inc,
@@ -319,14 +322,9 @@ if plugins_options['dell']
xmm_inc, xmm_inc,
] ]
c_args = [
'-DMM_MODULE_NAME="dell"',
'-DTESTUDEVRULESDIR_DELL="@0@"'.format(plugins_dir / 'dell'),
]
plugins += {'plugin-dell': { plugins += {'plugin-dell': {
'plugin': true, 'plugin': true,
'module': {'sources': files('dell/mm-plugin-dell.c'), 'include_directories': incs, 'c_args': c_args} 'module': {'sources': files('dell/mm-plugin-dell.c'), 'include_directories': incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="dell"']},
}} }}
plugins_udev_rules += files('dell/77-mm-dell-port-types.rules') plugins_udev_rules += files('dell/77-mm-dell-port-types.rules')
@@ -334,14 +332,12 @@ endif
# plugin: dlink # plugin: dlink
if plugins_options['dlink'] if plugins_options['dlink']
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_DLINK="@0@"'.format(plugins_dir / 'dlink')]
'-DMM_MODULE_NAME="d-link"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_DLINK="@0@"'.format(plugins_dir / 'dlink'),
]
plugins += {'plugin-dlink': { plugins += {'plugin-dlink': {
'plugin': true, 'plugin': true,
'module': {'sources': files('dlink/mm-plugin-dlink.c'), 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': files('dlink/mm-plugin-dlink.c'), 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="d-link"']},
}} }}
plugins_udev_rules += files('dlink/77-mm-dlink-port-types.rules') plugins_udev_rules += files('dlink/77-mm-dlink-port-types.rules')
@@ -349,10 +345,8 @@ endif
# plugin: fibocom # plugin: fibocom
if plugins_options['fibocom'] if plugins_options['fibocom']
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_FIBOCOM="@0@"'.format(plugins_dir / 'fibocom')]
'-DMM_MODULE_NAME="fibocom"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_FIBOCOM="@0@"'.format(plugins_dir / 'fibocom'),
]
sources = files( sources = files(
'fibocom/mm-broadband-bearer-fibocom-ecm.c', 'fibocom/mm-broadband-bearer-fibocom-ecm.c',
@@ -367,7 +361,7 @@ if plugins_options['fibocom']
endif endif
plugins += {'plugin-fibocom': { plugins += {'plugin-fibocom': {
'plugin': true, 'plugin': true,
'module': {'sources': sources, 'include_directories': plugins_incs + [xmm_inc] + [fibocom_inc], 'c_args': c_args}, 'module': {'sources': sources, 'include_directories': plugins_incs + [xmm_inc] + [fibocom_inc], 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="fibocom"']},
}} }}
plugins_udev_rules += files('fibocom/77-mm-fibocom-port-types.rules') plugins_udev_rules += files('fibocom/77-mm-fibocom-port-types.rules')
@@ -377,15 +371,15 @@ endif
if plugins_options['foxconn'] if plugins_options['foxconn']
foxconn_dir = plugins_dir / 'foxconn' foxconn_dir = plugins_dir / 'foxconn'
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_FOXCONN="@0@"'.format(foxconn_dir)]
'-DMM_MODULE_NAME="foxconn"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_FOXCONN="@0@"'.format(foxconn_dir),
'-DTESTKEYFILE_FOXCONN_T77W968="@0@"'.format(foxconn_dir / 'mm-foxconn-t77w968-carrier-mapping.conf'), test_keyfile_c_args = ['-DTESTKEYFILE_FOXCONN_T77W968="@0@"'.format(foxconn_dir / 'mm-foxconn-t77w968-carrier-mapping.conf')]
] plugins_test_keyfile_c_args += test_keyfile_c_args
plugins += {'plugin-foxconn': { plugins += {'plugin-foxconn': {
'plugin': true, 'plugin': true,
'module': {'sources': files('foxconn/mm-plugin-foxconn.c'), 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': files('foxconn/mm-plugin-foxconn.c'), 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + test_keyfile_c_args + ['-DMM_MODULE_NAME="foxconn"']},
}} }}
plugins_data += files( plugins_data += files(
@@ -405,14 +399,12 @@ endif
# plugin: gosuncn # plugin: gosuncn
if plugins_options['gosuncn'] if plugins_options['gosuncn']
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_GOSUNCN="@0@"'.format(plugins_dir / 'gosuncn')]
'-DMM_MODULE_NAME="gosuncn"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_GOSUNCN="@0@"'.format(plugins_dir / 'gosuncn'),
]
plugins += {'plugin-gosuncn': { plugins += {'plugin-gosuncn': {
'plugin': true, 'plugin': true,
'module': {'sources': files('gosuncn/mm-plugin-gosuncn.c'), 'include_directories': plugins_incs, 'c_args': c_args} 'module': {'sources': files('gosuncn/mm-plugin-gosuncn.c'), 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="gosuncn"']},
}} }}
plugins_udev_rules += files('gosuncn/77-mm-gosuncn-port-types.rules') plugins_udev_rules += files('gosuncn/77-mm-gosuncn-port-types.rules')
@@ -420,14 +412,12 @@ endif
# plugin: haier # plugin: haier
if plugins_options['haier'] if plugins_options['haier']
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_HAIER="@0@"'.format(plugins_dir / 'haier')]
'-DMM_MODULE_NAME="haier"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_HAIER="@0@"'.format(plugins_dir / 'haier'),
]
plugins += {'plugin-haier': { plugins += {'plugin-haier': {
'plugin': true, 'plugin': true,
'module': {'sources': files('haier/mm-plugin-haier.c'), 'include_directories': plugins_incs, 'c_args': c_args} 'module': {'sources': files('haier/mm-plugin-haier.c'), 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="haier"']},
}} }}
plugins_udev_rules += files('haier/77-mm-haier-port-types.rules') plugins_udev_rules += files('haier/77-mm-haier-port-types.rules')
@@ -437,7 +427,10 @@ endif
if plugins_options['huawei'] if plugins_options['huawei']
huawei_inc = include_directories('huawei') huawei_inc = include_directories('huawei')
common_c_args = ['-DTESTUDEVRULESDIR_HUAWEI="@0@"'.format(plugins_dir / 'huawei')] test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_HUAWEI="@0@"'.format(plugins_dir / 'huawei')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
common_c_args = test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="huawei"']
headers = files('huawei/mm-modem-helpers-huawei.h') headers = files('huawei/mm-modem-helpers-huawei.h')
@@ -468,8 +461,8 @@ if plugins_options['huawei']
plugins += {'plugin-huawei': { plugins += {'plugin-huawei': {
'plugin': true, 'plugin': true,
'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c') + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']}, 'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c') + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args},
'module': {'sources': sources + enums_sources + port_enums_sources + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']}, 'module': {'sources': sources + enums_sources + port_enums_sources + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args},
'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep}, 'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep},
}} }}
@@ -511,20 +504,20 @@ endif
# plugin: linktop # plugin: linktop
if plugins_options['linktop'] if plugins_options['linktop']
test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_LINKTOP="@0@"'.format(plugins_dir / 'linktop')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
common_c_args = test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="linktop"']
sources = files( sources = files(
'linktop/mm-plugin-linktop.c', 'linktop/mm-plugin-linktop.c',
'linktop/mm-broadband-modem-linktop.c', 'linktop/mm-broadband-modem-linktop.c',
) )
c_args = [
'-DMM_MODULE_NAME="linktop"',
'-DTESTUDEVRULESDIR_LINKTOP="@0@"'.format(plugins_dir / 'linktop'),
]
plugins += {'plugin-linktop': { plugins += {'plugin-linktop': {
'plugin': true, 'plugin': true,
'helper': {'sources': files('linktop/mm-modem-helpers-linktop.c'), 'include_directories': plugins_incs, 'c_args': c_args}, 'helper': {'sources': files('linktop/mm-modem-helpers-linktop.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
'test': {'sources': files('linktop/tests/test-modem-helpers-linktop.c'), 'include_directories': include_directories('linktop'), 'dependencies': libhelpers_dep}, 'test': {'sources': files('linktop/tests/test-modem-helpers-linktop.c'), 'include_directories': include_directories('linktop'), 'dependencies': libhelpers_dep},
}} }}
@@ -533,19 +526,17 @@ endif
# plugin: longcheer (and rebranded dongles) # plugin: longcheer (and rebranded dongles)
if plugins_options['longcheer'] if plugins_options['longcheer']
test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_LONGCHEER="@0@"'.format(plugins_dir / 'longcheer')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
sources = files( sources = files(
'longcheer/mm-broadband-modem-longcheer.c', 'longcheer/mm-broadband-modem-longcheer.c',
'longcheer/mm-plugin-longcheer.c', 'longcheer/mm-plugin-longcheer.c',
) )
c_args = [
'-DMM_MODULE_NAME="longcheer"',
'-DTESTUDEVRULESDIR_LONGCHEER="@0@"'.format(plugins_dir / 'longcheer'),
]
plugins += {'plugin-longcheer': { plugins += {'plugin-longcheer': {
'plugin': true, 'plugin': true,
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="longcheer"']},
}} }}
plugins_udev_rules += files('longcheer/77-mm-longcheer-port-types.rules') plugins_udev_rules += files('longcheer/77-mm-longcheer-port-types.rules')
@@ -553,7 +544,10 @@ endif
# plugin: ericsson mbm # plugin: ericsson mbm
if plugins_options['mbm'] if plugins_options['mbm']
common_c_args = ['-DTESTUDEVRULESDIR_MBM="@0@"'.format(plugins_dir / 'mbm')] test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_MBM="@0@"'.format(plugins_dir / 'mbm')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
common_c_args = test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']
sources = files( sources = files(
'mbm/mm-broadband-bearer-mbm.c', 'mbm/mm-broadband-bearer-mbm.c',
@@ -564,8 +558,8 @@ if plugins_options['mbm']
plugins += {'plugin-ericsson-mbm': { plugins += {'plugin-ericsson-mbm': {
'plugin': true, 'plugin': true,
'helper': {'sources': files('mbm/mm-modem-helpers-mbm.c'), 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']}, 'helper': {'sources': files('mbm/mm-modem-helpers-mbm.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']}, 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
'test': {'sources': files('mbm/tests/test-modem-helpers-mbm.c'), 'include_directories': plugins_incs + [include_directories('mbm')], 'dependencies': libhelpers_dep}, 'test': {'sources': files('mbm/tests/test-modem-helpers-mbm.c'), 'include_directories': plugins_incs + [include_directories('mbm')], 'dependencies': libhelpers_dep},
}} }}
@@ -587,19 +581,17 @@ endif
# plugin: mtk # plugin: mtk
if plugins_options['mtk'] if plugins_options['mtk']
test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_MTK="@0@"'.format(plugins_dir / 'mtk')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
sources = files( sources = files(
'mtk/mm-broadband-modem-mtk.c', 'mtk/mm-broadband-modem-mtk.c',
'mtk/mm-plugin-mtk.c', 'mtk/mm-plugin-mtk.c',
) )
c_args = [
'-DMM_MODULE_NAME="motorola"',
'-DTESTUDEVRULESDIR_MTK="@0@"'.format(plugins_dir / 'mtk'),
]
plugins += {'plugin-mtk': { plugins += {'plugin-mtk': {
'plugin': true, 'plugin': true,
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="motorola"']},
}} }}
plugins_udev_rules += files('mtk/77-mm-mtk-port-types.rules') plugins_udev_rules += files('mtk/77-mm-mtk-port-types.rules')
@@ -621,14 +613,12 @@ endif
# plugin: nokia (icera) # plugin: nokia (icera)
if plugins_options['nokia-icera'] if plugins_options['nokia-icera']
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_NOKIA_ICERA="@0@"'.format(plugins_dir / 'nokia')]
'-DMM_MODULE_NAME="nokia-icera"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_NOKIA_ICERA="@0@"'.format(plugins_dir / 'nokia'),
]
plugins += {'plugin-nokia-icera': { plugins += {'plugin-nokia-icera': {
'plugin': true, 'plugin': true,
'module': {'sources': files('nokia/mm-plugin-nokia-icera.c'), 'include_directories': plugins_incs + [icera_inc], 'c_args': c_args}, 'module': {'sources': files('nokia/mm-plugin-nokia-icera.c'), 'include_directories': plugins_incs + [icera_inc], 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="nokia-icera"']},
}} }}
plugins_udev_rules += files('nokia/77-mm-nokia-port-types.rules') plugins_udev_rules += files('nokia/77-mm-nokia-port-types.rules')
@@ -695,19 +685,17 @@ endif
# plugin: qcom-soc # plugin: qcom-soc
if plugins_options['qcom-soc'] if plugins_options['qcom-soc']
test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_QCOM_SOC="@0@"'.format(plugins_dir / 'qcom-soc')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
sources = files( sources = files(
'qcom-soc/mm-broadband-modem-qmi-qcom-soc.c', 'qcom-soc/mm-broadband-modem-qmi-qcom-soc.c',
'qcom-soc/mm-plugin-qcom-soc.c', 'qcom-soc/mm-plugin-qcom-soc.c',
) )
c_args = [
'-DMM_MODULE_NAME="qcom-soc"',
'-DTESTUDEVRULESDIR_QCOM_SOC="@0@"'.format(plugins_dir / 'qcom-soc'),
]
plugins += {'plugin-qcom-soc': { plugins += {'plugin-qcom-soc': {
'plugin': true, 'plugin': true,
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="qcom-soc"']},
}} }}
plugins_udev_rules += files('qcom-soc/77-mm-qcom-soc.rules') plugins_udev_rules += files('qcom-soc/77-mm-qcom-soc.rules')
@@ -715,7 +703,10 @@ endif
# plugin: quectel # plugin: quectel
if plugins_options['quectel'] if plugins_options['quectel']
common_c_args = ['-DTESTUDEVRULESDIR_QUECTEL="@0@"'.format(plugins_dir / 'quectel')] test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_QUECTEL="@0@"'.format(plugins_dir / 'quectel')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
common_c_args = test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="quectel"']
sources = files( sources = files(
'quectel/mm-broadband-modem-quectel.c', 'quectel/mm-broadband-modem-quectel.c',
@@ -733,8 +724,8 @@ if plugins_options['quectel']
plugins += {'plugin-quectel': { plugins += {'plugin-quectel': {
'plugin': true, 'plugin': true,
'helper': {'sources': files('quectel/mm-modem-helpers-quectel.c'), 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="quectel"']}, 'helper': {'sources': files('quectel/mm-modem-helpers-quectel.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="quectel"']}, 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
'test': {'sources': files('quectel/tests/test-modem-helpers-quectel.c'), 'include_directories': include_directories('quectel'), 'dependencies': libhelpers_dep}, 'test': {'sources': files('quectel/tests/test-modem-helpers-quectel.c'), 'include_directories': include_directories('quectel'), 'dependencies': libhelpers_dep},
}} }}
@@ -779,7 +770,10 @@ endif
# plugin: simtech # plugin: simtech
if plugins_options['simtech'] if plugins_options['simtech']
common_c_args = ['-DTESTUDEVRULESDIR_SIMTECH="@0@"'.format(plugins_dir / 'simtech')] test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_SIMTECH="@0@"'.format(plugins_dir / 'simtech')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
common_c_args = test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="simtech"']
sources = files( sources = files(
'simtech/mm-broadband-modem-simtech.c', 'simtech/mm-broadband-modem-simtech.c',
@@ -793,8 +787,8 @@ if plugins_options['simtech']
plugins += {'plugin-simtech': { plugins += {'plugin-simtech': {
'plugin': true, 'plugin': true,
'helper': {'sources': files('simtech/mm-modem-helpers-simtech.c'), 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="simtech"']}, 'helper': {'sources': files('simtech/mm-modem-helpers-simtech.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="quectel"']}, 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
'test': {'sources': files('simtech/tests/test-modem-helpers-simtech.c'), 'include_directories': plugins_incs + [include_directories('simtech')], 'dependencies': libport_dep}, 'test': {'sources': files('simtech/tests/test-modem-helpers-simtech.c'), 'include_directories': plugins_incs + [include_directories('simtech')], 'dependencies': libport_dep},
}} }}
@@ -803,14 +797,12 @@ endif
# plugin: telit # plugin: telit
if plugins_options['telit'] if plugins_options['telit']
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_TELIT="@0@"'.format(plugins_dir / 'telit')]
'-DMM_MODULE_NAME="telit"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_TELIT="@0@"'.format(plugins_dir / 'telit'),
]
plugins += {'plugin-telit': { plugins += {'plugin-telit': {
'plugin': true, 'plugin': true,
'module': {'sources': files('telit/mm-plugin-telit.c'), 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': files('telit/mm-plugin-telit.c'), 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="telit"']},
}} }}
plugins_udev_rules += files('telit/77-mm-telit-port-types.rules') plugins_udev_rules += files('telit/77-mm-telit-port-types.rules')
@@ -835,14 +827,12 @@ endif
# plugin: tplink # plugin: tplink
if plugins_options['tplink'] if plugins_options['tplink']
c_args = [ test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_TPLINK="@0@"'.format(plugins_dir / 'tplink')]
'-DMM_MODULE_NAME="tp-link"', plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
'-DTESTUDEVRULESDIR_TPLINK="@0@"'.format(plugins_dir / 'tplink'),
]
plugins += {'plugin-tplink': { plugins += {'plugin-tplink': {
'plugin': true, 'plugin': true,
'module': {'sources': files('tplink/mm-plugin-tplink.c'), 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': files('tplink/mm-plugin-tplink.c'), 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="tp-link"']},
}} }}
plugins_udev_rules += files('tplink/77-mm-tplink-port-types.rules') plugins_udev_rules += files('tplink/77-mm-tplink-port-types.rules')
@@ -918,19 +908,17 @@ endif
# plugin: alcatel/TCT/JRD x220D and possibly others # plugin: alcatel/TCT/JRD x220D and possibly others
if plugins_options['x22x'] if plugins_options['x22x']
test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_X22X="@0@"'.format(plugins_dir / 'x22x')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
sources = files( sources = files(
'x22x/mm-broadband-modem-x22x.c', 'x22x/mm-broadband-modem-x22x.c',
'x22x/mm-plugin-x22x.c', 'x22x/mm-plugin-x22x.c',
) )
c_args = [
'-DMM_MODULE_NAME="x22x"',
'-DTESTUDEVRULESDIR_X22X="@0@"'.format(plugins_dir / 'x22x'),
]
plugins += {'plugin-x22x': { plugins += {'plugin-x22x': {
'plugin': true, 'plugin': true,
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': c_args}, 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="x22x"']},
}} }}
plugins_udev_rules += files('x22x/77-mm-x22x-port-types.rules') plugins_udev_rules += files('x22x/77-mm-x22x-port-types.rules')
@@ -938,6 +926,9 @@ endif
# plugin: zte # plugin: zte
if plugins_options['zte'] if plugins_options['zte']
test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_ZTE="@0@"'.format(plugins_dir / 'zte')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
sources = files( sources = files(
'zte/mm-broadband-modem-zte.c', 'zte/mm-broadband-modem-zte.c',
'zte/mm-broadband-modem-zte-icera.c', 'zte/mm-broadband-modem-zte-icera.c',
@@ -945,14 +936,9 @@ if plugins_options['zte']
'zte/mm-plugin-zte.c', 'zte/mm-plugin-zte.c',
) )
c_args = [
'-DMM_MODULE_NAME="zte"',
'-DTESTUDEVRULESDIR_ZTE="@0@"'.format(plugins_dir / 'zte'),
]
plugins += {'plugin-zte': { plugins += {'plugin-zte': {
'plugin': true, 'plugin': true,
'module': {'sources': sources, 'include_directories': plugins_incs + [icera_inc], 'c_args': c_args}, 'module': {'sources': sources, 'include_directories': plugins_incs + [icera_inc], 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="zte"']},
}} }}
plugins_udev_rules += files('zte/77-mm-zte-port-types.rules') plugins_udev_rules += files('zte/77-mm-zte-port-types.rules')
@@ -1010,8 +996,8 @@ install_data(
# udev-rules and keyfiles tests # udev-rules and keyfiles tests
test_units = { test_units = {
'udev-rules': {'include_directories': top_inc, 'dependencies': libkerneldevice_dep}, 'udev-rules': {'include_directories': top_inc, 'dependencies': libkerneldevice_dep, 'c_args': plugins_test_udev_rules_dir_c_args},
'keyfiles': {'include_directories': [top_inc, src_inc], 'dependencies': libmm_glib_dep}, 'keyfiles': {'include_directories': [top_inc, src_inc], 'dependencies': libmm_glib_dep, 'c_args': plugins_test_keyfile_c_args},
} }
foreach name, data: test_units foreach name, data: test_units