mirror of
https://github.com/zeek/zeek.git
synced 2025-10-06 08:38:20 +00:00
Minor fixes to external test process. (addresses #298)
- Skip diffing of debug.log always. - Skip diffing of reporter.log if it only contains an error about missing GeoIP support. - Canonicalize X.509 Distinguished Name subjects since that can vary depending on installed OpenSSL version.
This commit is contained in:
parent
eeceb14c1a
commit
ff1768f857
3 changed files with 43 additions and 1 deletions
11
testing/external/scripts/diff-all
vendored
11
testing/external/scripts/diff-all
vendored
|
@ -22,7 +22,16 @@ files_cwd=`ls $@`
|
|||
files_baseline=`cd $TEST_BASELINE && ls $@`
|
||||
|
||||
for i in `echo $files_cwd $files_baseline | sort | uniq`; do
|
||||
if [[ "$i" != "loaded_scripts.log" && "$i" != "prof.log" ]]; then
|
||||
if [[ "$i" != "loaded_scripts.log" && "$i" != "prof.log" && "$i" != "debug.log" ]]; then
|
||||
|
||||
if [[ "$i" == "reporter.log" ]]; then
|
||||
# Do not diff the reporter.log if it only complains about missing
|
||||
# GeoIP support.
|
||||
if ! egrep -v "^#|Bro was not configured for GeoIP support" $i; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! btest-diff $i; then
|
||||
echo "" >>$diag
|
||||
echo "#### btest-diff $i" >>$diag
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue