Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/seth/624'

Browse source 
* origin/topic/seth/624:
  Support whitespace at end of line for config reader.

This merge fixes a failing test; it also sprinkles a few more spaces
into another test file.

The main change is that this now also works with configuration lines
that don't have a value.
This commit is contained in:
Johanna Amann 2019-10-14 21:26:17 -07:00
commit 66effde97d
7 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
testing/btest/scripts/base/frameworks/config/read_config.zeek
View file

@ -19,6 +19,7 @@ testport 45
testaddr 127.0.0.1
testaddr 2607:f8b0:4005:801::200e
testinterval 60
teststring abc
testtime 1507321987
test_set a,b,c,d,erdbeerschnitzel
test_vector 1,2,3,4,5,6

4
testing/btest/scripts/base/frameworks/input/config/basic.zeek
View file

@ -12,11 +12,11 @@ testcount 1
testcount 2
testcount 2
testint -1
testenum Conn::LOG
testenum Conn::LOG
testport 45
testportandproto 45/udp
testaddr 127.0.0.1
testaddr 2607:f8b0:4005:801::200e
testaddr 2607:f8b0:4005:801::200e
testinterval 60
testtime 1507321987
test_set a b c d erdbeerschnitzel