diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-25 15:48:05 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-25 15:48:05 +0100 |
commit | 0e0eaae4336cf2847a7deb76b974b73311f4acfd (patch) | |
tree | 6c62edec1bb739e4ac4f0ebbd2a50c1be8301f45 /tests/Makefile.am | |
parent | ec883905c13920de0bc33e5bdd0a75c80535b55c (diff) | |
parent | 93de3028b302adf3e3fb8e65bda5ca8bab59e9cd (diff) | |
download | rsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.tar.gz rsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.tar.xz rsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.zip |
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts:
ChangeLog
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2a4213f8..41b13a18 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,13 +13,15 @@ TESTS = $(TESTRUNS) cfg.sh \ asynwr_timeout.sh \ asynwr_small.sh \ asynwr_tinybuf.sh \ - asynwr_large.sh \ + wr_large_async.sh \ + wr_large_sync.sh \ asynwr_deadlock.sh \ asynwr_deadlock2.sh \ asynwr_deadlock4.sh \ gzipwr_large.sh \ gzipwr_large_dynfile.sh \ - dynfile_invalid.sh \ + dynfile_invld_async.sh \ + dynfile_invld_sync.sh \ dynfile_invalid2.sh \ complex1.sh \ queue-persist.sh \ @@ -163,8 +165,10 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/asynwr_small.conf \ asynwr_tinybuf.sh \ testsuites/asynwr_tinybuf.conf \ - asynwr_large.sh \ - testsuites/asynwr_large.conf \ + wr_large_async.sh \ + wr_large_sync.sh \ + wr_large.sh \ + testsuites/wr_large.conf \ asynwr_deadlock.sh \ testsuites/asynwr_deadlock.conf \ asynwr_deadlock2.sh \ @@ -177,8 +181,10 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/gzipwr_large_dynfile.conf \ complex1.sh \ testsuites/complex1.conf \ - dynfile_invalid.sh \ - testsuites/dynfile_invalid.conf \ + dynfile_invld_async.sh \ + dynfile_invld_sync.sh \ + dynfile_cachemiss.sh \ + testsuites/dynfile_cachemiss.conf \ dynfile_invalid2.sh \ testsuites/dynfile_invalid2.conf \ proprepltest.sh \ |