diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-05-01 21:06:41 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-05-01 21:06:41 +0200 |
commit | 6738873efce1370f5db31511800138ad1768feae (patch) | |
tree | 3040602a1ce459dc544a68331f5109cba98fecc1 | |
parent | 7178cd76f225a1c48911c68f2ae1855e97ff1397 (diff) | |
parent | a9c76ada086f933eae26ea13a272a435da430cb6 (diff) |
Merge pull request #3165 from evverx/tests-cleanups
tests,build-sys: some cleanups
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | catalog/systemd.hr.catalog | 2 | ||||
l---------[-rw-r--r--] | test/TEST-06-SELINUX/Makefile | 11 | ||||
l---------[-rw-r--r--] | test/TEST-08-ISSUE-2730/Makefile | 11 |
4 files changed, 7 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index b323de55c6..7f9ee08b20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5827,6 +5827,10 @@ EXTRA_DIST += \ test/TEST-07-ISSUE-1981/Makefile \ test/TEST-07-ISSUE-1981/test-segfault.sh \ test/TEST-07-ISSUE-1981/test.sh \ + test/TEST-08-ISSUE-2730/Makefile \ + test/TEST-08-ISSUE-2730/test.sh \ + test/TEST-09-ISSUE-2691/Makefile \ + test/TEST-09-ISSUE-2691/test.sh \ test/test-functions EXTRA_DIST += \ diff --git a/catalog/systemd.hr.catalog b/catalog/systemd.hr.catalog index 4a6c5ac1fc..350988dd87 100644 --- a/catalog/systemd.hr.catalog +++ b/catalog/systemd.hr.catalog @@ -67,7 +67,7 @@ Zapamtite da samo poruke iz usluge u upitu su odbačene, ostale poruke usluga nisu zahvaćene. Ograničenja koja kontroliraju kada je poruka odbačena mogu se podesiti -sa RateLimitInterval= i RateLimitBurst= u +sa RateLimitIntervalSec= i RateLimitBurst= u /etc/systemd/journald.conf. Pogledajte journald.conf(5) za više pojedinosti. -- e9bf28e6e834481bb6f48f548ad13606 diff --git a/test/TEST-06-SELINUX/Makefile b/test/TEST-06-SELINUX/Makefile index 5e89a29eff..e9f93b1104 100644..120000 --- a/test/TEST-06-SELINUX/Makefile +++ b/test/TEST-06-SELINUX/Makefile @@ -1,10 +1 @@ -all: - @make -s --no-print-directory -C ../.. all - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --all -setup: - @make --no-print-directory -C ../.. all - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --setup -clean: - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --clean -run: - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --run +../TEST-01-BASIC/Makefile
\ No newline at end of file diff --git a/test/TEST-08-ISSUE-2730/Makefile b/test/TEST-08-ISSUE-2730/Makefile index 5e89a29eff..e9f93b1104 100644..120000 --- a/test/TEST-08-ISSUE-2730/Makefile +++ b/test/TEST-08-ISSUE-2730/Makefile @@ -1,10 +1 @@ -all: - @make -s --no-print-directory -C ../.. all - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --all -setup: - @make --no-print-directory -C ../.. all - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --setup -clean: - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --clean -run: - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --run +../TEST-01-BASIC/Makefile
\ No newline at end of file |