diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-26 17:00:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-26 17:00:12 +0100 |
| commit | 46ac70bb3073295f70bdddc8359d056bc0651909 (patch) | |
| tree | 98b42b96616bc087980b0ddff9609f9174599d9e /tests | |
| parent | 3ab759c40d34f518744efa9b266640784fc3655f (diff) | |
| parent | b6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff) | |
| download | rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.gz rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.xz rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.zip | |
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts:
ChangeLog
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 41b13a18..7ca40766 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -54,7 +54,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/valid.conf \ cfg.sh \ cfg1.cfgtest \ - fg1.testin \ + cfg1.testin \ cfg2.cfgtest \ cfg2.testin \ cfg3.cfgtest \ @@ -109,7 +109,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/parse3.conf \ testsuites/reallife.parse3 \ testsuites/parse-nodate.conf \ - testsuites/reallife.parse-nodate \ testsuites/parse_invld_regex.conf \ testsuites/samples.parse_invld_regex \ testsuites/parse-3164-buggyday.conf \ |