From ee9c73a923909e23a649407be77e25235d769e25 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 May 2018 22:08:45 +0200 Subject: New upstream version 1.10.8 --- src/dnsmasq/nm-dnsmasq-manager.c | 2 +- src/dnsmasq/tests/meson.build | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete 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 041e75ea..323ef781 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 its default config file location, which if that + /* dnsmasq may read from it's 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 deleted file mode 100644 index 40f42f6f..00000000 --- a/src/dnsmasq/tests/meson.build +++ /dev/null @@ -1,14 +0,0 @@ -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()] -) -- cgit 1.3.0-6-gf8a5 From 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 4 Jun 2018 00:07:45 +0200 Subject: New upstream version 1.11.4 --- 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