Cleaning up some testing stuff.

- The Makefiles now run btest with "-f diag.log" so that diangnostics
  output will always be written into that file.

- Makefiles now hardcode path to btest to avoid picking up the wrong version
  if in PATH.

- The canonifier scripts now live in testing/scripts, and they are
  used from both btest/ and external/.

- There's a new diff-remove-uids scripts that removed connection UIDs
  for diffing. The external/* tests now use that by default.

- Timestamp removal now has its own script: diff-remove-timestamps.
  diff-canonifier calls that.

- All Makefile have a "brief" target that runs btest with -b.

- The higher-level directories have Makefile to call the subdirs.
This commit is contained in:
Robin Sommer 2011-07-05 18:36:31 -07:00
parent 1fded82c32
commit c738701ffd
20 changed files with 75 additions and 21 deletions

View file

@ -0,0 +1 @@
diag.log

11
testing/external/scripts/skel/Makefile vendored Normal file
View file

@ -0,0 +1,11 @@
DIAG=diag.log
BTEST=../../../aux/btest/btest
all:
@rm -f $(DIAG)
@$(BTEST) -f $(DIAG)
brief:
@rm -f $(DIAG)
@$(BTEST) -b -f $(DIAG)

View file

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