Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Add some missing @TEST-REQUIRES to a few tests
This commit is contained in:
Jon Siwek 2018-09-25 16:38:29 -05:00
commit 0c02b11226
5 changed files with 8 additions and 1 deletions

View file

@ -1,4 +1,8 @@
2.6-beta2-14 | 2018-09-25 16:38:29 -0500
* Add some missing @TEST-REQUIRES to a few tests (Daniel Thayer)
2.6-beta2-12 | 2018-09-24 10:56:09 -0500
* Fix BasicThread::SetOSName on FreeBSD (Dominik Charousset)

View file

@ -1 +1 @@
2.6-beta2-12
2.6-beta2-14

View file

@ -1,3 +1,4 @@
# @TEST-REQUIRES: which hexdump
# @TEST-EXEC: bro -b -r $TRACES/wikipedia.trace %INPUT
# @TEST-EXEC: hexdump -C 1.pcap >1.hex
# @TEST-EXEC: hexdump -C 2.pcap >2.hex

View file

@ -1,3 +1,4 @@
# @TEST-REQUIRES: which hexdump
# @TEST-EXEC: bro -r $TRACES/workshop_2011_browse.trace -w dump
# @TEST-EXEC: hexdump -C $TRACES/workshop_2011_browse.trace >1
# @TEST-EXEC: hexdump -C dump >2

View file

@ -4,6 +4,7 @@
#
# If this test fails, then the "Log Files" documentation page should be updated.
# @TEST-REQUIRES: which python
# @TEST-EXEC: bash %INPUT
# @TEST-EXEC: btest-diff out