From 80fcabdb4761d95b7fe8e4df8f46ad0fbccd25f6 Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Thu, 30 Jun 2011 22:50:06 -0700
Subject: [PATCH] Polishing the setup for external tests.

---
 policy/protocols/dns/auth-addl.bro                 | 4 ++++
 testing/external/Makefile                          | 2 +-
 testing/external/scripts/create-new-repo           | 7 ++++---
 testing/external/scripts/files/Makefile            | 3 +++
 testing/external/scripts/{ => files}/test.skeleton | 2 +-
 testing/external/{btest.cfg => subdir-btest.cfg}   | 4 ++--
 testing/external/tests/.gitignore                  | 0
 testing/external/tests/test.skeleton               | 2 --
 testing/external/traces/.gitignore                 | 0
 9 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 testing/external/scripts/files/Makefile
 rename testing/external/scripts/{ => files}/test.skeleton (52%)
 rename testing/external/{btest.cfg => subdir-btest.cfg} (85%)
 delete mode 100644 testing/external/tests/.gitignore
 delete mode 100644 testing/external/tests/test.skeleton
 delete mode 100644 testing/external/traces/.gitignore

diff --git a/policy/protocols/dns/auth-addl.bro b/policy/protocols/dns/auth-addl.bro
index ee42389a8e..ab88eedb0a 100644
--- a/policy/protocols/dns/auth-addl.bro
+++ b/policy/protocols/dns/auth-addl.bro
@@ -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 
 	# base script to be overridden since the base script will log immediately 
 	# after all of the ANS replies have been seen.
+
+    if ( ! c?$dns )
+                print c$id;
+            
 	c$dns$ready=F;
 	
 	if ( ans$answer_type == DNS_AUTH )
diff --git a/testing/external/Makefile b/testing/external/Makefile
index 2bd7adc144..5dce270206 100644
--- a/testing/external/Makefile
+++ b/testing/external/Makefile
@@ -5,7 +5,7 @@ all:
 	@for repo in *.git; do (echo "==== $$repo" && cd $$repo && btest ); echo; done
 
 init:
-	git clone $(PUBLIC_REPO) public.git
+	git clone $(PUBLIC_REPO) bro-testing.git
 
 pull:
 	@for repo in *.git; do ( cd $$repo && git pull ); done
diff --git a/testing/external/scripts/create-new-repo b/testing/external/scripts/create-new-repo
index 111dbbeb37..2ed772b426 100755
--- a/testing/external/scripts/create-new-repo
+++ b/testing/external/scripts/create-new-repo
@@ -27,14 +27,15 @@ git clone $repo $name
 
 cd $name
 
-for dir in traces tests Baseline; do
+for dir in Traces Tests Baseline; do
     mkdir $dir
     touch $dir/.gitignore
 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 *
 
diff --git a/testing/external/scripts/files/Makefile b/testing/external/scripts/files/Makefile
new file mode 100644
index 0000000000..7bbb5317f4
--- /dev/null
+++ b/testing/external/scripts/files/Makefile
@@ -0,0 +1,3 @@
+
+all:
+	@btest
diff --git a/testing/external/scripts/test.skeleton b/testing/external/scripts/files/test.skeleton
similarity index 52%
rename from testing/external/scripts/test.skeleton
rename to testing/external/scripts/files/test.skeleton
index 7f79ab0d3d..46a8f7a48d 100644
--- a/testing/external/scripts/test.skeleton
+++ b/testing/external/scripts/files/test.skeleton
@@ -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
diff --git a/testing/external/btest.cfg b/testing/external/subdir-btest.cfg
similarity index 85%
rename from testing/external/btest.cfg
rename to testing/external/subdir-btest.cfg
index 270bfea93c..9c7f9b7f88 100644
--- a/testing/external/btest.cfg
+++ b/testing/external/subdir-btest.cfg
@@ -3,7 +3,7 @@ TestDirs    = tests
 TmpDir      = %(testbase)s/.tmp
 BaselineDir = %(testbase)s/Baseline
 IgnoreDirs  = .svn CVS .tmp
-IgnoreFiles = *.tmp *.swp #* *.trace .gitignore
+IgnoreFiles = *.tmp *.swp #* *.trace .gitignore *.skeleton
 
 [environment]
 BROPATH=`bash -c %(testbase)s/../../../build/bro-path-dev`
@@ -12,7 +12,7 @@ TZ=UTC
 LC_ALL=C
 PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../aux/btest:%(default_path)s
 TEST_DIFF_CANONIFIER=%(testbase)s/../scripts/diff-canonifier
-TRACES=%(testbase)s/traces
+TRACES=%(testbase)s/Traces
 SCRIPTS=%(testbase)s/../scripts
 DIST=%(testbase)s/../../..
 BUILD=%(testbase)s/../../../build
diff --git a/testing/external/tests/.gitignore b/testing/external/tests/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/testing/external/tests/test.skeleton b/testing/external/tests/test.skeleton
deleted file mode 100644
index 7f79ab0d3d..0000000000
--- a/testing/external/tests/test.skeleton
+++ /dev/null
@@ -1,2 +0,0 @@
-@TEST-EXEC: bro -r $TRACES/trace.pcap mt
-@TEST-EXEC: for i in *.log; do btest-diff $i; done
diff --git a/testing/external/traces/.gitignore b/testing/external/traces/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000