Merged
Conversation
Contributor
jubois
commented
Jan 16, 2019
jubois
commented
- Changed output to diff --side-by-side style
- Runs all tests and set exit code to 0 only if all tests passed (else 1)
ddpbsd
reviewed
Jan 17, 2019
contrib/logtesting/dotests.sh
Outdated
| cat tmpres | ||
| echo "** ERROR: Exiting." | ||
| echo "== DIFF OUTPUT (reference | new): ==" | ||
| diff -Nay $idir/res tmpres |
Contributor
Author
There was a problem hiding this comment.
I checked with the virtual ossec appliance and the -y exists...
What is your distribution ?
Member
There was a problem hiding this comment.
OpenBSD in this case. I haven't checked others.
jubois
force-pushed
the
improve-dotests.sh-output
branch
from
af75380 to
48efa6d
Compare
- Remove use of -y option in diff command (OpenBSD -y does not
support it)
- Force input as text for grep (-a opton)
- use a cleanup function to restore hostname and remove tmpres when
the script exits or is interrupted.
- use --color option of diff if it is supported.
jubois
force-pushed
the
improve-dotests.sh-output
branch
from
e9a933c to
e643ba4
Compare
Member
|
It doesn't work on OpenBSD anyway. I'll have to peek at that later. Thanks for the updates! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.