rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-15 10:30:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: "make distcheck" did not work

Browse Source
This commit is contained in:
Rainer Gerhards 2009-03-31 22:03:02 +02:00
parent ec9e031599
commit 91d6888a8a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/parsertest.c
View File

@ -105,7 +105,7 @@ int openPipe(pid_t *pid, int *pfd)
char *newenviron[] = { NULL };
sprintf(confFile, "-f%s/testruns/parser2.conf", getenv("srcdir"));
sprintf(confFile, "-f%s/testruns/parser.conf", getenv("srcdir"));
newargv[1] = confFile;
if (pipe(pipefd) == -1) {
@ -232,7 +232,13 @@ doTests(int fd, char *files)
}
globfree(&testFiles);
printf("Number of tests run: %d, number of failures: %d\n", iTests, iFailed);
if(iTests == 0) {
printf("Error: no test cases found, no tests executed.\n");
iFailed = 1;
} else {
printf("Number of tests run: %d, number of failures: %d\n", iTests, iFailed);
}
return(iFailed);
}
@ -261,5 +267,3 @@ int main(int argc, char *argv[])
printf("End of parser tests.\n");
exit(ret);
}

2
tests/testruns/parser.conf
View File

@ -5,5 +5,5 @@ $UDPServerRun 12514
$ErrorMessagesToStderr off
# use a special format that we can easily parse in expect
$template expect,"{{%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp%,%hostname%,%programname%,%syslogtag%,%msg%}}"
$template expect,"%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp%,%hostname%,%programname%,%syslogtag%,%msg%\n"
*.* :omstdout:;expect