diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /dispatcher/tests | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'dispatcher/tests')
| -rw-r--r-- | dispatcher/tests/meson.build | 3 | ||||
| -rw-r--r-- | dispatcher/tests/test-dispatcher-envp.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index 6ead88bf..b18c66e5 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -13,8 +13,7 @@ exe = executable( c_args: [ '-DNETWORKMANAGER_COMPILATION_TEST', '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT', - ] + - nm_build_cflags, + ], link_with: libnm_dispatcher_core ) diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c index 5fa4a314..78bcd233 100644 --- a/dispatcher/tests/test-dispatcher-envp.c +++ b/dispatcher/tests/test-dispatcher-envp.c @@ -124,7 +124,7 @@ parse_device (GKeyFile *kf, GVariant **out_device_props, GError **error) { GVariantBuilder props; char *tmp; - gint i; + int i; g_variant_builder_init (&props, G_VARIANT_TYPE ("a{sv}")); |