about summary refs log tree commit diff
path: root/src/dnsmasq
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-04-23 18:01:04 +0200
committerMichael Biebl <biebl@debian.org>2018-04-23 18:01:04 +0200
commitd00e17d14b5df5f7fcba1a17f91edbb3180fbf64 (patch)
tree2b16542fff332a3c38fb2191f7ae4d4795f66451 /src/dnsmasq
parent2e03b565aa24225ca4992797a5d563542b0b2bdd (diff)
parentf60117b41d5433be1b4a96d82cd11d0c3dce9b63 (diff)
Update upstream source from tag 'upstream/1.11.3'
Update to upstream version '1.11.3'
with Debian dir a3a34e6c602cb81e76dc3c255c617e7f7ecfc11c
Diffstat (limited to 'src/dnsmasq')
-rw-r--r--src/dnsmasq/nm-dnsmasq-manager.c2
-rw-r--r--src/dnsmasq/tests/meson.build14
2 files changed, 15 insertions, 1 deletions
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..40f42f6f
--- /dev/null
+++ b/src/dnsmasq/tests/meson.build
@@ -0,0 +1,14 @@
+test_unit = 'test-dnsmasq-utils'
+
+exe = executable(
+  test_unit,
+  test_unit + '.c',
+  dependencies: test_nm_dep,
+  c_args: '-DTESTDIR="@0@"'.format(meson.source_root())
+)
+
+test(
+  'dnsmasq/' + test_unit,
+  test_script,
+  args: test_args + [exe.full_path()]
+)