From f7c115a47aa92ab4956cb815b708e8f1b8fb8fda Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Wed, 10 Jan 2018 13:20:02 -0600 Subject: [PATCH] Fix a test that fails in some environments The "coverage/init-default.test" will always fail if there is a path component named "build" anywhere before the bro install directory (for example, if the tests are run from home dir of a user named "build"). Fixed this by making a regex more specific so that it matches the correct lines in loaded_scripts.log. --- testing/btest/coverage/init-default.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/btest/coverage/init-default.test b/testing/btest/coverage/init-default.test index 6877159c62..d736277d49 100644 --- a/testing/btest/coverage/init-default.test +++ b/testing/btest/coverage/init-default.test @@ -11,7 +11,7 @@ #@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 '/build/|/loaded-scripts.bro|#' | sed 's#/./#/#g' >loaded_scripts.log.tmp +#@TEST-EXEC: cat loaded_scripts.log | egrep -v '/build/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