mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
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:
parent
1fded82c32
commit
c738701ffd
20 changed files with 75 additions and 21 deletions
5
testing/external/scripts/create-new-repo
vendored
5
testing/external/scripts/create-new-repo
vendored
|
@ -34,8 +34,9 @@ done
|
|||
|
||||
ln -s ../subdir-btest.cfg ./btest.cfg
|
||||
|
||||
cp $cwd/`dirname $0`/files/test.skeleton tests
|
||||
cp $cwd/`dirname $0`/files/Makefile .
|
||||
cp $cwd/`dirname $0`/skel/test.skeleton tests
|
||||
cp $cwd/`dirname $0`/skel/Makefile .
|
||||
cp $cwd/`dirname $0`/skel/.gitignore .
|
||||
|
||||
git add *
|
||||
|
||||
|
|
5
testing/external/scripts/diff-canonifier
vendored
5
testing/external/scripts/diff-canonifier
vendored
|
@ -1,5 +0,0 @@
|
|||
#! /usr/bin/env bash
|
||||
#
|
||||
# Replace anything which looks like timestamps with XXXs.
|
||||
|
||||
sed 's/[0-9]\{10\}\.[0-9]\{2,8\}/XXXXXXXXXX.XXXXXX/g'
|
3
testing/external/scripts/files/Makefile
vendored
3
testing/external/scripts/files/Makefile
vendored
|
@ -1,3 +0,0 @@
|
|||
|
||||
all:
|
||||
@btest
|
1
testing/external/scripts/skel/.gitignore
vendored
Normal file
1
testing/external/scripts/skel/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
diag.log
|
11
testing/external/scripts/skel/Makefile
vendored
Normal file
11
testing/external/scripts/skel/Makefile
vendored
Normal 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)
|
Loading…
Add table
Add a link
Reference in a new issue