diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-10-19 18:48:43 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-10-22 13:19:15 +0200 |
| commit | e0b168d6a84141408c48126fb4f358df1222870c (patch) | |
| tree | 088219abea3c5af002abb6f8e1a15d18732ecc30 /src/platform/tests | |
| parent | 581be6b8d2b34dac0050988d690d83da7c44f517 (diff) | |
| download | NetworkManager-e0b168d6a84141408c48126fb4f358df1222870c.tar.gz | |
meson: Fix platform tests
All platform tests were run twice with the `linux` platform, instead of
`fake` and `linux`, as expected.
Diffstat (limited to 'src/platform/tests')
| -rw-r--r-- | src/platform/tests/meson.build | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build index 0571efacff..67582d7766 100644 --- a/src/platform/tests/meson.build +++ b/src/platform/tests/meson.build @@ -1,28 +1,27 @@ test_units = [ - ['test-link-fake', 'test-link.c', 60], - ['test-link-linux', 'test-link.c', 60], - ['test-address-fake', 'test-address.c'], - ['test-address-linux', 'test-address.c'], - ['test-general', 'test-general.c'], - ['test-nmp-object', 'test-nmp-object.c'], - ['test-route-fake', 'test-route.c'], - ['test-route-linux', 'test-route.c'], - ['test-cleanup-fake', 'test-cleanup.c'], - ['test-cleanup-linux', 'test-cleanup.c'], + ['test-link-fake', 'test-link.c', test_nm_dep_fake, 30], + ['test-link-linux', 'test-link.c', test_nm_dep_linux, 90], + ['test-address-fake', 'test-address.c', test_nm_dep_fake, 30], + ['test-address-linux', 'test-address.c', test_nm_dep_linux, 30], + ['test-general', 'test-general.c', test_nm_dep, 30], + ['test-nmp-object', 'test-nmp-object.c', test_nm_dep, 30], + ['test-route-fake', 'test-route.c', test_nm_dep_fake, 30], + ['test-route-linux', 'test-route.c', test_nm_dep_linux, 30], + ['test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, 30], + ['test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, 30], ] foreach test_unit: test_units exe = executable( 'platform-' + test_unit[0], test_unit[1], - dependencies: test_nm_dep, - c_args: test_cflags_platform + dependencies: test_unit[2], ) test( 'platform/' + test_unit[0], test_script, - timeout: test_unit.length() > 2 ? test_unit[2] : 30, + timeout: test_unit[3], args: test_args + [exe.full_path()] ) endforeach @@ -33,5 +32,4 @@ executable( test, test + '.c', dependencies: test_nm_dep, - c_args: test_cflags_platform ) |