Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove fix relative path of syslog-ng in func test #858

Merged
merged 4 commits into from
Jan 14, 2016

Conversation

bazsi
Copy link
Collaborator

@bazsi bazsi commented Jan 6, 2016

originallly @lmesz submitted this branch as PR #813 which I've reworked a bit. This contains a combination of his and my work and thus superseeds #813, which should be closed without merging.

The aim of this code is to make it possible to run the functest on a binary that is outside of the build tree by specifying a SYSLOG_NG_BINARY environment variable. e.g. functest would be able to run on an installed binary.

I have added @lmesz's signoff to the last patch as it was missing, but please confirm that it is ok this way (see the contributing guide what that means):

https://github.com/balabit/syslog-ng/blob/master/CONTRIBUTING.md

please merge.

bazsi and others added 4 commits January 6, 2016 10:13
@module_path@ as exported by the configure script usually only contains the
directory where modules are installed, which may contain several
directories. A subsequent patch needs the directory where modules were
installed by default, so publish that as well.

Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
As it makes the code pretty fragile and the output is generated by multiple
printf() statements anyway.

Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
The functional test script needs these values, so make them available here.
Original patch by Laszlo Meszaros, which was modified by me (Balazs Scheidler).

Signed-off-by: Laszlo Meszaros <lacienator@gmail.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
 * From now on the syslog-ng binary doesn't have to be relative to func
   tests. It can be passed via SYSLOG_NG_BINARY environment variable.

Signed-off-by: Laszlo Meszaros <lacienator@gmail.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
@lmesz
Copy link
Contributor

lmesz commented Jan 14, 2016

👍
I think it is okay in this way :)

lbudai added a commit that referenced this pull request Jan 14, 2016
…slog-ng-in-func-test

F/remove fix relative path of syslog ng in func test
@lbudai lbudai merged commit 8503c32 into master Jan 14, 2016
@MrAnno MrAnno changed the title F/remove fix relative path of syslog ng in func test Remove fix relative path of syslog-ng in func test Feb 10, 2016
@bazsi bazsi deleted the f/remove-fix-relative-path-of-syslog-ng-in-func-test branch August 15, 2017 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants