openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

cmocka: Drop as meson subproject

Browse Source 
Depend exclusive on the cmocka package provided by the build
environment. Cmocka is widely available in Linux distributions and BSD
systems. Besides that, it is suboptimal to fetch own dependencies in the
build process. Most packaging systems even forbid fetching additional
assets at build time.

Change-Id: I751c85d5f72e47356113cf55dfbaec73cbd8028c
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66696
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Thomas Heijligen 2022-08-12 19:57:28 +02:00 committed by Thomas Heijligen
parent 4ad591bcdc
commit 99eca0899b
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -495,11 +495,7 @@ subdir('util')
# `.allowed()` gets introduced in 0.59.0 # `.allowed()` gets introduced in 0.59.0
if get_option('tests').auto() or get_option('tests').enabled() if get_option('tests').auto() or get_option('tests').enabled()
# unit-test framework # unit-test framework
cmocka_dep = dependency( cmocka = dependency('cmocka', required : get_option('tests'))
'cmocka',
fallback: ['cmocka', 'cmocka_dep'],
required : get_option('tests')
)
flashrom_test_dep = declare_dependency( flashrom_test_dep = declare_dependency(
include_directories : include_dir, include_directories : include_dir,
@ -518,7 +514,7 @@ if get_option('tests').auto() or get_option('tests').enabled()
], ],
) )
if cmocka_dep.found() if cmocka.found()
subdir('tests') subdir('tests')
endif endif
endif endif

10
subprojects/cmocka.wrap
View File

@ -1,10 +0,0 @@
[wrap-file]
directory = cmocka-1.1.5
source_url = https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
source_filename = cmocka-1.1.5.tar.xz
source_hash = f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6
patch_url = https://wrapdb.mesonbuild.com/v1/projects/cmocka/1.1.5/3/get_zip
patch_filename = cmocka-1.1.5-3-wrap.zip
patch_hash = 81ce48613680d3c3a0b396ac570c852b290adcd18202fb16aaf703a9493f4348

2
tests/meson.build
View File

@ -112,6 +112,6 @@ flashrom_tests = executable('flashrom_unit_tests',
], ],
export_dynamic : true, export_dynamic : true,
link_args : mocks, link_args : mocks,
dependencies : [cmocka_dep, flashrom_test_dep], dependencies : [cmocka, flashrom_test_dep],
) )
test('cmocka test flashrom', flashrom_tests) test('cmocka test flashrom', flashrom_tests)