]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
build-sys: Do not build tests that depend on resolved when it has been disabled 2652/head
authorFilipe Brandenburger <filbranden@google.com>
Thu, 18 Feb 2016 08:39:38 +0000 (00:39 -0800)
committerFilipe Brandenburger <filbranden@google.com>
Thu, 18 Feb 2016 08:39:38 +0000 (00:39 -0800)
If ./configure --disable-resolved has been used, do not try to build
test-dns-packet and test-resolve-tables which depend on it.

Previously, the SOURCES, LIBS and LDADDs for these tests were made conditional
while the main rules for them weren't, causing build failures trying to build a
binary with no sources.

This was uncovered when trying to build udeb for systemd in CI, which uses
--disable-resolved for a minimal build, which uncovered the issue.

Fixes #2651.

Makefile.am

index 8c151f538fceb0353a9d4a035499b84d16d9c5f5..9ffa40bbd7c7b2cf2ce2c67ef3af88b9b62dc348 100644 (file)
@@ -1476,8 +1476,6 @@ tests += \
        test-af-list \
        test-arphrd-list \
        test-dns-domain \
-       test-dns-packet \
-       test-resolve-tables \
        test-install-root \
        test-rlimit-util \
        test-signal-util
@@ -5208,6 +5206,8 @@ bin_PROGRAMS += \
        systemd-resolve
 
 tests += \
+       test-dns-packet \
+       test-resolve-tables \
        test-dns-domain \
        test-dnssec