From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- src/dnsmasq/nm-dnsmasq-manager.c | 2 +- src/dnsmasq/tests/meson.build | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/dnsmasq/tests/meson.build (limited to 'src/dnsmasq') diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c index 323ef781..041e75ea 100644 --- a/src/dnsmasq/nm-dnsmasq-manager.c +++ b/src/dnsmasq/nm-dnsmasq-manager.c @@ -181,7 +181,7 @@ create_dm_cmd_line (const char *iface, nm_cmd_line_add_string (cmd, "--log-queries"); } - /* dnsmasq may read from it's default config file location, which if that + /* dnsmasq may read from its default config file location, which if that * location is a valid config file, it will combine with the options here * and cause undesirable side-effects. Like sending bogus IP addresses * as the gateway or whatever. So tell dnsmasq not to use any config file diff --git a/src/dnsmasq/tests/meson.build b/src/dnsmasq/tests/meson.build new file mode 100644 index 00000000..12106c52 --- /dev/null +++ b/src/dnsmasq/tests/meson.build @@ -0,0 +1,13 @@ +test_unit = 'test-dnsmasq-utils' + +exe = executable( + test_unit, + test_unit + '.c', + dependencies: test_nm_dep, +) + +test( + 'dnsmasq/' + test_unit, + test_script, + args: test_args + [exe.full_path()] +) -- cgit 1.3.0-6-gf8a5