]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #2104 from evverx/rlimit-util-test
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 8 Dec 2015 04:47:45 +0000 (23:47 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 8 Dec 2015 04:47:45 +0000 (23:47 -0500)
tests: add test-rlimit-util

1  2 
Makefile.am

diff --combined Makefile.am
index 65a118820a99084a91f98cfb6d0bd7b087043a28,ab9be281af8ea74bca392856da4b76c0cbd7c547..1dda8c5137f789fa2e6942778493ceb116e2e315
@@@ -147,6 -147,7 +147,7 @@@ tests
  manual_tests =
  TEST_EXTENSIONS = .py
  PY_LOG_COMPILER = $(PYTHON)
+ DISABLE_HARD_ERRORS = yes
  if ENABLE_TESTS
  noinst_PROGRAMS = $(manual_tests) $(tests)
  TESTS = $(tests)
@@@ -744,6 -745,8 +745,6 @@@ CLEANFILES += 
        man/systemd.index.xml \
        man/systemd.directives.xml
  
 -EXTRA_DIST += \
 -      tools/make-man-rules.py
  
  endif
  
@@@ -752,7 -755,6 +753,7 @@@ endi
  EXTRA_DIST += \
        $(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \
        tools/make-man-index.py \
 +      tools/make-man-rules.py \
        tools/make-directive-index.py \
        tools/xml_helper.py \
        man/glib-event-glue.c
@@@ -1496,7 -1498,8 +1497,8 @@@ tests += 
        test-af-list \
        test-arphrd-list \
        test-dns-domain \
-       test-install-root
+       test-install-root \
+       test-rlimit-util
  
  if HAVE_ACL
  tests += \
@@@ -1859,6 -1862,12 +1861,12 @@@ test_acl_util_LDADD = 
  test_namespace_LDADD = \
        libcore.la
  
+ test_rlimit_util_SOURCES = \
+       src/test/test-rlimit-util.c
+ test_rlimit_util_LDADD = \
+       libshared.la
  BUILT_SOURCES += \
        src/test/test-hashmap-ordered.c
  
@@@ -4815,6 -4824,9 +4823,6 @@@ systemd_timesyncd_SOURCES = 
  nodist_systemd_timesyncd_SOURCES = \
        src/timesync/timesyncd-gperf.c
  
 -gperf_gperf_sources += \
 -      src/timesync/timesyncd-gperf.gperf
 -
  systemd_timesyncd_LDADD = \
        libsystemd-network.la \
        libshared.la
@@@ -4828,18 -4840,15 +4836,18 @@@ nodist_systemunit_DATA += 
  GENERAL_ALIASES += \
        $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service
  
 -EXTRA_DIST += \
 -      units/systemd-timesyncd.service.in
  
  nodist_pkgsysconf_DATA += \
        src/timesync/timesyncd.conf
  
 +endif
 +
 +gperf_gperf_sources += \
 +      src/timesync/timesyncd-gperf.gperf
 +
  EXTRA_DIST += \
 +      units/systemd-timesyncd.service.in \
        src/timesync/timesyncd.conf.in
 -endif
  
  # ------------------------------------------------------------------------------
  if HAVE_MYHOSTNAME
@@@ -5468,11 -5477,10 +5476,11 @@@ SYSTEM_UNIT_ALIASES += 
  BUSNAMES_TARGET_WANTS += \
        org.freedesktop.network1.busname
  
 +endif
 +
  gperf_gperf_sources += \
        src/network/networkd-network-gperf.gperf \
        src/network/networkd-netdev-gperf.gperf
 -endif
  
  EXTRA_DIST += \
        units/systemd-networkd.service.m4.in \
@@@ -6208,7 -6216,21 +6216,7 @@@ DISTCHECK_CONFIGURE_FLAGS += 
        --disable-split-usr
  endif
  
 -#
 -# Require python when making dist
 -#
 -.PHONY: dist-check-python dist-check-compat-libs dist-check-help
 -dist-check-python:
 -if !HAVE_PYTHON
 -      @echo "*** python and python-lxml module must be installed and enabled in order to make dist"
 -      @false
 -endif
 -
 -dist-check-compat-libs:
 -if !ENABLE_COMPAT_LIBS
 -      @echo "*** compat-libs must be enabled in order to make dist"
 -      @false
 -endif
 +.PHONY: dist-check-help
  
  dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
                exit 1;                                                        \
              fi; done
  
 -dist: dist-check-python dist-check-compat-libs
 -
  .PHONY: hwdb-update
  hwdb-update:
        ( cd $(top_srcdir)/hwdb && \