Adapt zeek-aux btests to zeek structure

This updates Baselines, changes paths to scripts and log files, adds TEST-DOC
annotations, and various other cleanups that make the zeek-aux tests more like
the rest of the zeek tests.
This commit is contained in:
Tim Wojtulewicz 2025-08-11 10:17:05 -07:00
parent 7887451a66
commit d7ba381d12
61 changed files with 311 additions and 326 deletions

View file

@ -1,38 +1,38 @@
# Test zeek-cut with -c and -C options.
# @TEST-DOC: Test zeek-cut with -c and -C options.
#
# Show first header for one log file.
# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -c > one-1st-nocols
# @TEST-EXEC: btest-diff one-1st-nocols
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -c > one-1st-nocols
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff one-1st-nocols
# Show all headers for one log file.
# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -C > one-all-nocols
# @TEST-EXEC: btest-diff one-all-nocols
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -C > one-all-nocols
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff one-all-nocols
# Show first header for two log files.
# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -c uid ts > two-1st-withcols
# @TEST-EXEC: btest-diff two-1st-withcols
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -c uid ts > two-1st-withcols
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff two-1st-withcols
# Show all headers for two log files.
# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -C uid ts > two-all-withcols
# @TEST-EXEC: btest-diff two-all-withcols
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -C uid ts > two-all-withcols
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff two-all-withcols
# Show all headers for two logs (-C overrides -c).
# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -c -C uid ts > both-c-opts-all
# @TEST-EXEC: btest-diff both-c-opts-all
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -c -C uid ts > both-c-opts-all
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff both-c-opts-all
# Show first header for two logs (-c overrides -C).
# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -C -c uid ts > both-c-opts-one
# @TEST-EXEC: btest-diff both-c-opts-one
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -C -c uid ts > both-c-opts-one
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff both-c-opts-one
# Log files use different field separators.
# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conncomma.log | zeek-cut -C proto uid > nondefault-separator
# @TEST-EXEC: btest-diff nondefault-separator
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/conncomma.log | zeek-cut -C proto uid > nondefault-separator
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff nondefault-separator
# Column order changes between two log files.
# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conntimelast.log | zeek-cut -C > different-col-order
# @TEST-EXEC: btest-diff different-col-order
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/conntimelast.log | zeek-cut -C > different-col-order
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff different-col-order
# Column order changes between two log files (and don't show all columns).
# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conntimelast.log | zeek-cut -C ts uid > different-col-order-some
# @TEST-EXEC: btest-diff different-col-order-some
# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/conntimelast.log | zeek-cut -C ts uid > different-col-order-some
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff different-col-order-some