Merge branch 'master' into sol-test
authorRainer Gerhards <rgerhards@adiscon.com>
Tue, 31 Mar 2009 18:06:10 +0000 (20:06 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Tue, 31 Mar 2009 18:06:10 +0000 (20:06 +0200)
Conflicts:
tests/Makefile.am

1  2 
ChangeLog
configure.ac
tests/Makefile.am
tools/syslogd.c

diff --cc ChangeLog
Simple merge
diff --cc configure.ac
Simple merge
@@@ -1,11 -1,10 +1,10 @@@
- testruns = rt_init rscript
- check_PROGRAMS = $(testruns) ourtail
- TESTS = $(testruns) cfg.sh
 -check_PROGRAMS = rt_init rscript parsertest
++check_PROGRAMS = rt_init rscript ourtail parsertest
+ TESTS = $(check_PROGRAMS) cfg.sh
  TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
+ DISTCLEANFILES=rsyslog.pid
  
  test_files = testbench.h runtime-dummy.c
- EXTRA_DIST=1.rstest 2.rstest 3.rstest err1.rstest \
-          cfg.sh \
+ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
           cfg1.cfgtest \
           cfg1.testin \
                   cfg2.cfgtest \
           cfg4.testin \
           DevNull.cfgtest \
           err1.rstest \
-          NoExistFile.cfgtest
+          NoExistFile.cfgtest \
+          testruns/parser.conf \
+          testruns/1.parse1 \
+          testruns/rfc3164.parse1 \
+          testruns/rfc5424-1.parse1 \
+          testruns/rfc5424-2.parse1 \
+          testruns/rfc5424-3.parse1 \
+          testruns/rfc5424-4.parse1 \
+          cfg.sh
  
 +ourtail_SOURCES = ourtail.c
 +
  rt_init_SOURCES = rt-init.c $(test_files)
  rt_init_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
 -rt_init_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS)
 +rt_init_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS)
  rt_init_LDFLAGS = -export-dynamic
  
  rscript_SOURCES = rscript.c $(test_files)
diff --cc tools/syslogd.c
Simple merge