diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-26 01:06:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-26 01:06:02 -0400 |
| commit | 88d0127d07f0de5b0aa536deaf2b84877a402a6b (patch) | |
| tree | 066de356346419669f017bf8350691af3d0422e0 /test | |
| parent | 9155dec335ce55c5443088595717f282aa27f055 (diff) | |
| parent | eeea4ae0f9e1652e553015c7db7d640ec172a7b5 (diff) | |
Merge branch 'lukeshu-postmove' into lukeshu
# Conflicts:
# src/libshared/Makefile
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/Makefile b/test/Makefile index 3959ab7c5b..7114c25c95 100644 --- a/test/Makefile +++ b/test/Makefile @@ -36,12 +36,12 @@ manual_tests += \ test-ipv4ll-manual \ test-ask-password-api -if HAVE_LIBIPTC +ifneq ($(HAVE_LIBIPTC),) manual_tests += \ test-firewall-util endif -if HAVE_KMOD +ifneq ($(HAVE_KMOD),) manual_tests += \ test-netlink-manual endif @@ -119,7 +119,7 @@ tests += \ test-rlimit-util \ test-signal-util -if HAVE_ACL +ifneq ($(HAVE_ACL),) tests += \ test-acl-util endif @@ -290,7 +290,7 @@ test_resolve_tables_SOURCES = \ test_resolve_tables_LDADD = \ libshared.la -if ENABLE_EFI +ifneq ($(ENABLE_EFI),) manual_tests += \ test-boot-timestamp @@ -637,7 +637,7 @@ test_btrfs_SOURCES = \ test_btrfs_LDADD = \ libshared.la -if HAVE_LIBIPTC +ifneq ($(HAVE_LIBIPTC),) test_firewall_util_SOURCES = \ src/test/test-firewall-util.c |