Polishing the setup for external tests.

This commit is contained in:
Robin Sommer 2011-06-30 22:50:06 -07:00
parent 27aa30c683
commit 80fcabdb47
9 changed files with 15 additions and 9 deletions

View file

@ -16,6 +16,10 @@ event do_reply(c: connection, msg: dns_msg, ans: dns_answer, reply: string) &pri
# The "ready" flag will be set here. This causes the setting from the # The "ready" flag will be set here. This causes the setting from the
# base script to be overridden since the base script will log immediately # base script to be overridden since the base script will log immediately
# after all of the ANS replies have been seen. # after all of the ANS replies have been seen.
if ( ! c?$dns )
print c$id;
c$dns$ready=F; c$dns$ready=F;
if ( ans$answer_type == DNS_AUTH ) if ( ans$answer_type == DNS_AUTH )

View file

@ -5,7 +5,7 @@ all:
@for repo in *.git; do (echo "==== $$repo" && cd $$repo && btest ); echo; done @for repo in *.git; do (echo "==== $$repo" && cd $$repo && btest ); echo; done
init: init:
git clone $(PUBLIC_REPO) public.git git clone $(PUBLIC_REPO) bro-testing.git
pull: pull:
@for repo in *.git; do ( cd $$repo && git pull ); done @for repo in *.git; do ( cd $$repo && git pull ); done

View file

@ -27,14 +27,15 @@ git clone $repo $name
cd $name cd $name
for dir in traces tests Baseline; do for dir in Traces Tests Baseline; do
mkdir $dir mkdir $dir
touch $dir/.gitignore touch $dir/.gitignore
done done
ln -s ../btest.cfg . ln -s ../subdir-btest.cfg ./btest.cfg
cp $cwd/`dirname $0`/test.skeleton tests cp $cwd/`dirname $0`/files/test.skeleton tests
cp $cwd/`dirname $0`/files/Makefile .
git add * git add *

View file

@ -0,0 +1,3 @@
all:
@btest

View file

@ -1,2 +1,2 @@
@TEST-EXEC: bro -r $TRACES/trace.pcap mt @TEST-EXEC: bro -r $TRACES/test.trace test-all
@TEST-EXEC: for i in *.log; do btest-diff $i; done @TEST-EXEC: for i in *.log; do btest-diff $i; done

View file

@ -3,7 +3,7 @@ TestDirs = tests
TmpDir = %(testbase)s/.tmp TmpDir = %(testbase)s/.tmp
BaselineDir = %(testbase)s/Baseline BaselineDir = %(testbase)s/Baseline
IgnoreDirs = .svn CVS .tmp IgnoreDirs = .svn CVS .tmp
IgnoreFiles = *.tmp *.swp #* *.trace .gitignore IgnoreFiles = *.tmp *.swp #* *.trace .gitignore *.skeleton
[environment] [environment]
BROPATH=`bash -c %(testbase)s/../../../build/bro-path-dev` BROPATH=`bash -c %(testbase)s/../../../build/bro-path-dev`
@ -12,7 +12,7 @@ TZ=UTC
LC_ALL=C LC_ALL=C
PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../aux/btest:%(default_path)s PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../aux/btest:%(default_path)s
TEST_DIFF_CANONIFIER=%(testbase)s/../scripts/diff-canonifier TEST_DIFF_CANONIFIER=%(testbase)s/../scripts/diff-canonifier
TRACES=%(testbase)s/traces TRACES=%(testbase)s/Traces
SCRIPTS=%(testbase)s/../scripts SCRIPTS=%(testbase)s/../scripts
DIST=%(testbase)s/../../.. DIST=%(testbase)s/../../..
BUILD=%(testbase)s/../../../build BUILD=%(testbase)s/../../../build

View file

View file

@ -1,2 +0,0 @@
@TEST-EXEC: bro -r $TRACES/trace.pcap mt
@TEST-EXEC: for i in *.log; do btest-diff $i; done

View file