diff --git a/CHANGES b/CHANGES index 632465b4a0..e556ad8ea9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ +2.5-545 | 2018-05-01 18:09:30 -0500 + + * Improve canonicalization of build dir path in a coverage unit test + (Corelight) + 2.5-544 | 2018-05-01 17:57:15 -0500 * Rewrite the DHCP analyzer and accompanying script-layer API. diff --git a/VERSION b/VERSION index 75a080b8dc..0575788c00 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-544 +2.5-545 diff --git a/testing/btest/coverage/init-default.test b/testing/btest/coverage/init-default.test index c74c264eb8..537b5ca77d 100644 --- a/testing/btest/coverage/init-default.test +++ b/testing/btest/coverage/init-default.test @@ -11,7 +11,8 @@ #@TEST-EXEC: test -e $DIST/scripts/base/init-default.bro #@TEST-EXEC: ( cd $DIST/scripts/base && find . -name '*.bro' ) | sort >"all scripts found" #@TEST-EXEC: bro misc/loaded-scripts -#@TEST-EXEC: cat loaded_scripts.log | egrep -v "/$(test -L $BUILD && basename $(readlink $BUILD) || basename $BUILD)/scripts/|/loaded-scripts.bro|#" | sed 's#/./#/#g' >loaded_scripts.log.tmp +#@TEST-EXEC: (test -L $BUILD && basename $(readlink $BUILD) || basename $BUILD) >buildprefix +#@TEST-EXEC: cat loaded_scripts.log | egrep -v "/build/scripts/|$(cat buildprefix)/scripts/|/loaded-scripts.bro|#" | sed 's#/./#/#g' >loaded_scripts.log.tmp #@TEST-EXEC: cat loaded_scripts.log.tmp | sed 's/ //g' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix #@TEST-EXEC: cat loaded_scripts.log.tmp | sed 's/ //g' | sed "s#`cat prefix`#./#g" | sort >init-default.bro #@TEST-EXEC: diff -u "all scripts found" init-default.bro | egrep "^-[^-]" > missing_loads