From 8e29c1fc47523c894b78894d6fdeb43f2d97811d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 27 Mar 2009 17:13:28 +0100
Subject: solved some more issues with "make [dist]check"

especially when executed as non-root
---
 tests/Makefile.am          | 2 +-
 tests/parser.tcl           | 4 ++--
 tests/testruns/parser.conf | 2 +-
 tests/work/dummy           | 3 ---
 4 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 tests/work/dummy

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0de5a2f1..f22ca139 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,7 @@
 check_PROGRAMS = rt_init rscript
 TESTS = $(check_PROGRAMS) cfg.sh parsertest
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
+DISTCLEANFILES=rsyslog.pid
 
 test_files = testbench.h runtime-dummy.c
 EXTRA_DIST=parser.tcl \
@@ -24,7 +25,6 @@ EXTRA_DIST=parser.tcl \
 	   testruns/rfc5424-2.parse1 \
 	   testruns/rfc5424-3.parse1 \
 	   testruns/rfc5424-4.parse1 \
-	   work/dummy \
 	   parsertest
 
 rt_init_SOURCES = rt-init.c $(test_files)
diff --git a/tests/parser.tcl b/tests/parser.tcl
index 047607c6..1adeac25 100644
--- a/tests/parser.tcl
+++ b/tests/parser.tcl
@@ -30,11 +30,11 @@ if {$argc == 0 } {
 	set srcdir "$argv";
 }
 
-set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-f$srcdir/testruns/parser.conf" "-u2" "-n" "-i$srcdir/work/rsyslog.pid" "-M../runtime/.libs"];
+set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-f$srcdir/testruns/parser.conf" "-u2" "-n" "-irsyslog.pid" "-M../runtime/.libs"];
 #interact;
 expect "}}"; # eat startup message
 set udpSock [udp_open];
-udp_conf $udpSock 127.0.0.1 514
+udp_conf $udpSock 127.0.0.1 12514
 set files [glob "$srcdir/testruns/*.parse1"]
 set failed 0;
 puts "\nExecuting parser test suite...";
diff --git a/tests/testruns/parser.conf b/tests/testruns/parser.conf
index 7b4b4aed..8d32746c 100644
--- a/tests/testruns/parser.conf
+++ b/tests/testruns/parser.conf
@@ -1,6 +1,6 @@
 $ModLoad ../plugins/omstdout/.libs/omstdout
 $ModLoad ../plugins/imudp/.libs/imudp
-$UDPServerRun 514
+$UDPServerRun 12514
 
 $ErrorMessagesToStderr off
 
diff --git a/tests/work/dummy b/tests/work/dummy
deleted file mode 100644
index 93c5babb..00000000
--- a/tests/work/dummy
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a dummy file. It's only purpose is to ensure
-that ./test/work is created so that "make distcheck"
-and "make check" can operate properly.
-- 
cgit