From a4b57b322e1864b092d386f935defb0dc59920d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 26 Sep 2017 11:59:08 +0200
Subject: [PATCH 1/4] sysv-generator-test: drop python2 work-around

We require python3 for meson anyway, so support python2 doesn't seem
useful anymore.
---
 test/sysv-generator-test.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
index 99e323db3b..9774378ae6 100755
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -26,12 +26,7 @@ import tempfile
 import shutil
 from glob import glob
 import collections
-
-try:
-    from configparser import RawConfigParser
-except ImportError:
-    # python 2
-    from ConfigParser import RawConfigParser
+from configparser import RawConfigParser
 
 sysv_generator = os.path.join(os.environ.get('builddir', '.'), 'systemd-sysv-generator')
 

From 73e406e1406ec5251e8a9f30f2682393293876c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 26 Sep 2017 13:34:55 +0200
Subject: [PATCH 2/4] sysv-generator-test: do not query $builddir

This variable is not set by meson, so let's not try to use it.

We could use some more elaborate scheme (e.g. based on $MESON_BUILD_ROOT and
$MESON_SUBDIR) to find the path to systemd-sysv-generator, but it seems
that plain ./systemd-sysv-generator works just as well and has the advantage
that it's easy to invoke the test by hand (as long as one cd's to the
meson build dir).
---
 test/sysv-generator-test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
index 9774378ae6..18bb40f812 100755
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -28,7 +28,7 @@ from glob import glob
 import collections
 from configparser import RawConfigParser
 
-sysv_generator = os.path.join(os.environ.get('builddir', '.'), 'systemd-sysv-generator')
+sysv_generator = './systemd-sysv-generator'
 
 class MultiDict(collections.OrderedDict):
     def __setitem__(self, key, value):

From b7191b2a9b55cf88842a71cfc294327666ad098a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 26 Sep 2017 13:39:43 +0200
Subject: [PATCH 3/4] meson: hook up udev-test.pl again

Seems it was dropped along with the automake rules in
72cdb3e783174dcf9223a49f03e3b0e2ca95ddb8.
---
 test/meson.build | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/meson.build b/test/meson.build
index bddeeb62b4..ddcd8aa4c9 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -165,3 +165,17 @@ endif
 sysv_generator_test_py = find_program('sysv-generator-test.py')
 test('sysv-generator-test',
      sysv_generator_test_py)
+
+############################################################
+
+# prepare test/sys tree
+sys_script_py = find_program('sys-script.py')
+custom_target(
+        'sys',
+        command : [sys_script_py, meson.current_build_dir()],
+        output : 'sys',
+        build_by_default : true)
+
+udev_test_pl = find_program('udev-test.pl')
+test('udev-test',
+     udev_test_pl)

From fdf666bc76658de964bf9fcf61b218d7bdd4b4f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 26 Sep 2017 13:44:04 +0200
Subject: [PATCH 4/4] meson: hook up hwdb-test.sh again

The motivation for the ./systemd-hwdb is the same as in the grandparent
for systemd-sysv-generator.
---
 test/hwdb-test.sh | 2 +-
 test/meson.build  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh
index 5373930df4..2221c0d7fd 100755
--- a/test/hwdb-test.sh
+++ b/test/hwdb-test.sh
@@ -21,7 +21,7 @@
 set -e
 
 ROOTDIR=$(dirname $(dirname $(readlink -f $0)))
-SYSTEMD_HWDB=${builddir:-.}/systemd-hwdb
+SYSTEMD_HWDB=./systemd-hwdb
 
 if [ ! -x "$SYSTEMD_HWDB" ]; then
     echo "$SYSTEMD_HWDB does not exist, please build first"
diff --git a/test/meson.build b/test/meson.build
index ddcd8aa4c9..9fdcd2d8d2 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -179,3 +179,7 @@ custom_target(
 udev_test_pl = find_program('udev-test.pl')
 test('udev-test',
      udev_test_pl)
+
+hwdb_test_sh = find_program('hwdb-test.sh')
+test('hwdb-test',
+     hwdb_test_sh)