summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-09-26 13:44:04 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-09-26 13:44:38 +0200
commitfdf666bc76658de964bf9fcf61b218d7bdd4b4f7 (patch)
treedf7a7f252003b38f064e5f8edcadb040cc2df4c3
parentb7191b2a9b55cf88842a71cfc294327666ad098a (diff)
downloadsystemd-fdf666bc76658de964bf9fcf61b218d7bdd4b4f7.tar.gz
meson: hook up hwdb-test.sh again
The motivation for the ./systemd-hwdb is the same as in the grandparent for systemd-sysv-generator.
-rwxr-xr-xtest/hwdb-test.sh2
-rw-r--r--test/meson.build4
2 files changed, 5 insertions, 1 deletions
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)