diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-12 15:10:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-12 15:10:00 +0200 |
| commit | 7053a438efd07361b6e33de4bdf254b1d3b58553 (patch) | |
| tree | bd5c83d8141bcd28a0c0a21f447ecdab522ab487 /tests/Makefile.am | |
| parent | 6eeff56d010e48e4e5a7eca41223832edca5c5d1 (diff) | |
| parent | 4ebd062564c068566d60b4f54c047e6c082edf8e (diff) | |
| download | rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.tar.gz rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.tar.xz rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 051a9403..a43f305e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,7 +25,6 @@ TESTS = $(TESTRUNS) cfg.sh \ dynfile_invld_sync.sh \ dynfile_invalid2.sh \ complex1.sh \ - random.sh \ queue-persist.sh \ pipeaction.sh execonlyonce.sh \ @@ -42,6 +41,10 @@ TESTS += omod-if-array.sh \ fieldtest.sh endif +if ENABLE_EXTENDED_TESTS +TESTS += random.sh +endif + check_JAVA = DiagTalker.java endif # if ENABLE_TESTBENCH @@ -111,6 +114,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/parse3.conf \ testsuites/reallife.parse3 \ testsuites/parse-nodate.conf \ + testsuites/samples.parse-nodate \ testsuites/parse_invld_regex.conf \ testsuites/samples.parse_invld_regex \ testsuites/parse-3164-buggyday.conf \ |