shared: simplify dns_name_hash_func() end of name detection

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f552f7a60bce51852cb99c49a0fe5088d23c3677..c5b15b884a272ed1acbbd4ddc99fc7319dd570fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1054,7 +1054,9 @@ libshared_la_SOURCES = \
        src/shared/machine-image.c \
        src/shared/machine-image.h \
        src/shared/machine-pool.c \
-       src/shared/machine-pool.h
+       src/shared/machine-pool.h \
+       src/shared/resolve-util.c \
+       src/shared/resolve-util.h
 
 if HAVE_UTMP
 libshared_la_SOURCES += \
@@ -3744,6 +3746,7 @@ EXTRA_DIST += \
        hwdb/sdio.ids
 
 # ------------------------------------------------------------------------------
+if ENABLE_TESTS
 TESTS += \
        test/udev-test.pl
 
@@ -3756,6 +3759,7 @@ TESTS += \
        test/sysv-generator-test.py
 endif
 endif
+endif
 
 manual_tests += \
        test-libudev \
@@ -3775,8 +3779,10 @@ test_udev_LDADD = \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
+if ENABLE_TESTS
 check_DATA += \
        test/sys
+endif
 
 # packed sysfs test tree
 test/sys:
@@ -6281,14 +6287,14 @@ install-tree: all
        tree $(abs_srcdir)/install-tree
 
 # Let's run all tests of the test suite, but under valgrind. Let's
-# exclude the one perl script we have in there
+# exclude perl/python/shell scripts we have in there
 .PHONY: valgrind-tests
 valgrind-tests: $(TESTS)
-       $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
+       $(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \
                if file $$f | grep -q shell; then \
                echo -e "$${x}Skipping non-binary $$f"; else \
                echo -e "$${x}Running $$f"; \
-               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+               $(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
                x="\n\n"; \
        done