From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 26 Sep 2017 11:34:55 +0000 (+0200)
Subject: sysv-generator-test: do not query $builddir
X-Git-Tag: v235~61^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73e406e1406ec5251e8a9f30f2682393293876c0;p=thirdparty%2Fsystemd.git

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).
---

diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
index 9774378ae6a..18bb40f8128 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):