diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-10-08 16:52:10 +0200 |
|---|---|---|
| committer | Chris Down <chris@chrisdown.name> | 2019-10-10 00:53:09 +0100 |
| commit | 4f10b80786e8baa1399b6de6111d5b3a16bf99ba (patch) | |
| tree | 5b252b5af99d44bfb1f3e606ab90c04280c11e24 /test | |
| parent | ef2ad30aee9fa99b0fdb8fe7efda397513cec6af (diff) | |
| download | systemd-4f10b80786e8baa1399b6de6111d5b3a16bf99ba.tar.gz | |
Rename udev's hwdb/ to hwdb.d/
As in the parent commit, this makes the name consistent with the
rest of the source tree and the actuall installation path.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/hwdb-test.sh | 4 | ||||
| -rw-r--r-- | test/hwdb.d/10-bad.hwdb (renamed from test/hwdb/10-bad.hwdb) | 0 | ||||
| -rw-r--r-- | test/meson.build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh index 05363e9ad6..d12f82fa2d 100755 --- a/test/hwdb-test.sh +++ b/test/hwdb-test.sh @@ -21,7 +21,7 @@ fi D=$(mktemp --directory) trap "rm -rf '$D'" EXIT INT QUIT PIPE mkdir -p "$D/etc/udev" -ln -s "$ROOTDIR/hwdb" "$D/etc/udev/hwdb.d" +ln -s "$ROOTDIR/hwdb.d" "$D/etc/udev/hwdb.d" # Test "good" properties" — no warnings or errors allowed err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$? @@ -42,7 +42,7 @@ fi # Test "bad" properties" — warnings required, errors not allowed rm -f "$D/etc/udev/hwdb.bin" "$D/etc/udev/hwdb.d" -ln -s "$ROOTDIR/test/hwdb" "$D/etc/udev/hwdb.d" +ln -s "$ROOTDIR/test/hwdb.d" "$D/etc/udev/hwdb.d" err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$? if [ -n "$rc" ]; then echo "$SYSTEMD_HWDB returned $rc" diff --git a/test/hwdb/10-bad.hwdb b/test/hwdb.d/10-bad.hwdb index 0e1e147323..0e1e147323 100644 --- a/test/hwdb/10-bad.hwdb +++ b/test/hwdb.d/10-bad.hwdb diff --git a/test/meson.build b/test/meson.build index 36d9df729c..24ab4d1dee 100644 --- a/test/meson.build +++ b/test/meson.build @@ -26,7 +26,7 @@ test_data_files = ''' h.service hello-after-sleep.target hello.service - hwdb/10-bad.hwdb + hwdb.d/10-bad.hwdb i.service journal-data/journal-1.txt journal-data/journal-2.txt |