From d7ba381d12b78772e3197e4d8548f1cd2de97deb Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 11 Aug 2025 10:17:05 -0700 Subject: [PATCH] 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. --- .pre-commit-config.yaml | 3 +- .../header.h | 10 ++-- .../zeek-aux.zeek-cut.time-conversion/both-2 | 10 ++-- .../different-col-order | 20 ++++---- .../zeek-aux.zeek-cut.time-conversion/local | 10 ++-- .../multiple-times | 8 +-- .../time-last-col | 10 ++-- .../zeek-aux.zeek-cut.time-fmt-env/env-local | 10 ++-- .../env-local-fmt | 10 ++-- .../zeek-aux.zeek-cut.time-fmt/local-fmt | 10 ++-- .../zeek-aux.zeek-cut.time-fmt/utc-fmt-local | 10 ++-- .../zeek-aux.zeek-cut.time-fmt/utc-local-fmt | 10 ++-- .../different-col-order | 20 ++++---- .../different-field-separator | 20 ++++---- .../missing-ts-one-file | 10 ++-- .../multiple-times | 8 +-- .../nondefault-separator | 10 ++-- .../zeek-aux.zeek-cut.time-header/ts-twice | 10 ++-- testing/btest/btest.cfg | 3 +- .../update-changes/changes-up-to-date.sh | 4 +- .../update-changes/initialize-from-prompt.sh | 3 +- .../update-changes/initialize-from-tag.sh | 2 +- .../update-changes/initialize-from-version.sh | 3 +- .../replace-version-in-c-header.sh | 7 ++- .../replace-version-in-python-package.sh | 7 ++- .../update-changes/replace-version-in-rst.sh | 7 ++- .../replace-version-in-script.sh | 7 ++- .../replace-version-in-setup-py.sh | 7 ++- .../tag-dev-point-release-ahead-of-origin.sh | 3 +- .../tag-point-release-ahead-of-origin.sh | 3 +- .../tag-point-release-at-origin.sh | 3 +- .../tag-release-ahead-of-origin-new-commit.sh | 4 +- .../tag-release-ahead-of-origin.sh | 3 +- .../update-changes/tag-release-at-origin.sh | 3 +- .../command-injection-filenames.test | 4 +- .../zeek-archiver/custom-delimiter.test | 4 +- .../zeek-archiver/custom-timestamp.test | 4 +- .../btest/zeek-aux/zeek-archiver/default.test | 4 +- .../zeek-archiver/disable-compression.test | 4 +- .../zeek-archiver/extra-compression-args.test | 4 +- .../zeek-archiver/failing-compress.test | 5 +- .../zeek-aux/zeek-archiver/metadata-addl.test | 4 +- .../zeek-archiver/metadata-empty.test | 4 +- .../zeek-archiver/metadata-invalid.test | 9 ++-- .../zeek-aux/zeek-archiver/metadata.test | 4 +- .../zeek-archiver/pre-compression-logs.test | 4 +- .../btest/zeek-aux/zeek-archiver/umask.test | 4 +- testing/btest/zeek-aux/zeek-cut/bad-logs.test | 16 +++--- testing/btest/zeek-aux/zeek-cut/columns.test | 34 ++++++------- testing/btest/zeek-aux/zeek-cut/help.test | 2 +- .../btest/zeek-aux/zeek-cut/minimal-view.test | 50 +++++++++---------- .../btest/zeek-aux/zeek-cut/no-options.test | 10 ++-- .../btest/zeek-aux/zeek-cut/not-columns.test | 38 +++++++------- testing/btest/zeek-aux/zeek-cut/ofs.test | 18 +++---- .../btest/zeek-aux/zeek-cut/show-header.test | 38 +++++++------- .../zeek-aux/zeek-cut/time-bad-logs.test | 8 +-- .../zeek-aux/zeek-cut/time-conversion.test | 32 ++++++------ .../btest/zeek-aux/zeek-cut/time-fmt-env.test | 10 ++-- testing/btest/zeek-aux/zeek-cut/time-fmt.test | 14 +++--- .../btest/zeek-aux/zeek-cut/time-header.test | 30 +++++------ .../zeek-aux/zeek-cut/time-optional.test | 11 ++-- 61 files changed, 311 insertions(+), 326 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cb23081cff..de86d1a574 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: - "c" - "c++" - "json" - exclude: '^(auxil/zeek-aux/plugin-support/skeleton/src/Plugin.*)' + exclude: '^(auxil/zeek-aux/plugin-support/skeleton/src/Plugin.*|testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-c-header/header.h)' - repo: https://github.com/maxwinterstein/shfmt-py rev: v3.12.0.1 @@ -40,6 +40,7 @@ repos: - id: ruff-check args: ["--fix"] - id: ruff-format + exclude: '^(testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-.*/.*)$' - repo: https://github.com/cheshirekow/cmake-format-precommit rev: v0.6.13 diff --git a/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-c-header/header.h b/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-c-header/header.h index 4140d66d10..7a160c5abb 100644 --- a/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-c-header/header.h +++ b/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-c-header/header.h @@ -1,5 +1,5 @@ -## #BTest baseline data generated by btest - diff.Do not edit.Use "btest -U/-u" to update.Requires BTest >= 0.63. -#define ZEEK_VERSION "1.0.0-2" /* with comment */ -#define ZEEK_VERSION "1.0.0-2" /* with comment */ -#define FOO_VERSION "1.0.0-2" // another comment - ... +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +#define ZEEK_VERSION "1.0.0-2" /* with comment */ +#define ZEEK_VERSION "1.0.0-2" /* with comment */ + #define FOO_VERSION "1.0.0-2" // another comment +... diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/both-2 b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/both-2 index 4f92e4068f..bd0d157f27 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/both-2 +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/both-2 @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -2012-02-21T08:52:55-0800 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) -2012-02-21T08:52:59-0800 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) -2012-02-21T08:53:14-0800 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) -2012-02-21T08:53:17-0800 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) -2012-02-21T08:52:41-0800 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) +2012-02-21T16:52:55+0000 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) +2012-02-21T16:52:59+0000 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) +2012-02-21T16:53:14+0000 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) +2012-02-21T16:53:17+0000 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) +2012-02-21T16:52:41+0000 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/different-col-order b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/different-col-order index 4c57810e32..d9103034bc 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/different-col-order +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/different-col-order @@ -1,11 +1,11 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -2012-02-21T08:52:55-0800 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) -2012-02-21T08:52:59-0800 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) -2012-02-21T08:53:14-0800 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) -2012-02-21T08:53:17-0800 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) -2012-02-21T08:52:41-0800 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) -CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) 2012-02-21T08:52:55-0800 -CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) 2012-02-21T08:52:59-0800 -CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) 2012-02-21T08:53:14-0800 -CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) 2012-02-21T08:53:17-0800 -CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) 2012-02-21T08:52:41-0800 +2012-02-21T16:52:55+0000 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) +2012-02-21T16:52:59+0000 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) +2012-02-21T16:53:14+0000 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) +2012-02-21T16:53:17+0000 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) +2012-02-21T16:52:41+0000 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) +CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) 2012-02-21T16:52:55+0000 +CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) 2012-02-21T16:52:59+0000 +CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) 2012-02-21T16:53:14+0000 +CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) 2012-02-21T16:53:17+0000 +CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) 2012-02-21T16:52:41+0000 diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/local b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/local index 4f92e4068f..bd0d157f27 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/local +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/local @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -2012-02-21T08:52:55-0800 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) -2012-02-21T08:52:59-0800 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) -2012-02-21T08:53:14-0800 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) -2012-02-21T08:53:17-0800 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) -2012-02-21T08:52:41-0800 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) +2012-02-21T16:52:55+0000 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) +2012-02-21T16:52:59+0000 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) +2012-02-21T16:53:14+0000 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) +2012-02-21T16:53:17+0000 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) +2012-02-21T16:52:41+0000 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/multiple-times b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/multiple-times index 3fe073a34a..d17fa16c1d 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/multiple-times +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/multiple-times @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -2012-02-21T08:52:55-0800 tcp 2012-02-21T08:53:05-0800 -2012-02-21T08:52:59-0800 udp 2012-02-21T08:52:59-0800 -2012-02-21T08:53:14-0800 tcp 2012-02-21T08:53:24-0800 -2012-02-21T08:53:24-0800 tcp 2012-02-21T08:54:15-0800 +2012-02-21T16:52:55+0000 tcp 2012-02-21T16:53:05+0000 +2012-02-21T16:52:59+0000 udp 2012-02-21T16:52:59+0000 +2012-02-21T16:53:14+0000 tcp 2012-02-21T16:53:24+0000 +2012-02-21T16:53:24+0000 tcp 2012-02-21T16:54:15+0000 diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/time-last-col b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/time-last-col index 9a73503143..a96b557523 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/time-last-col +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/time-last-col @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) 2012-02-21T08:52:55-0800 -CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) 2012-02-21T08:52:59-0800 -CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) 2012-02-21T08:53:14-0800 -CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) 2012-02-21T08:53:17-0800 -CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) 2012-02-21T08:52:41-0800 +CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) 2012-02-21T16:52:55+0000 +CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) 2012-02-21T16:52:59+0000 +CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) 2012-02-21T16:53:14+0000 +CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) 2012-02-21T16:53:17+0000 +CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) 2012-02-21T16:52:41+0000 diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local index bc370043e5..2fb696a5fe 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -0852_120221 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) -0852_120221 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) -0853_120221 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) -0853_120221 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) -0852_120221 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) +1652_120221 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) +1652_120221 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) +1653_120221 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) +1653_120221 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) +1652_120221 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local-fmt index 67218e781e..3d8d27e449 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local-fmt +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local-fmt @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -08 52 12 02 21 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) -08 52 12 02 21 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) -08 53 12 02 21 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) -08 53 12 02 21 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) -08 52 12 02 21 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) +16 52 12 02 21 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) +16 52 12 02 21 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) +16 53 12 02 21 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) +16 53 12 02 21 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) +16 52 12 02 21 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-fmt index 67218e781e..3d8d27e449 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-fmt +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-fmt @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -08 52 12 02 21 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) -08 52 12 02 21 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) -08 53 12 02 21 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) -08 53 12 02 21 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) -08 52 12 02 21 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) +16 52 12 02 21 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) +16 52 12 02 21 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) +16 53 12 02 21 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) +16 53 12 02 21 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) +16 52 12 02 21 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-fmt-local b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-fmt-local index 67218e781e..3d8d27e449 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-fmt-local +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-fmt-local @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -08 52 12 02 21 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) -08 52 12 02 21 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) -08 53 12 02 21 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) -08 53 12 02 21 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) -08 52 12 02 21 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) +16 52 12 02 21 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) +16 52 12 02 21 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) +16 53 12 02 21 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) +16 53 12 02 21 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) +16 52 12 02 21 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-local-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-local-fmt index 67218e781e..3d8d27e449 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-local-fmt +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-local-fmt @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -08 52 12 02 21 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) -08 52 12 02 21 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) -08 53 12 02 21 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) -08 53 12 02 21 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) -08 52 12 02 21 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) +16 52 12 02 21 CjhGID4nQcgTWjvg4c 141.142.220.235 37604 199.233.217.249 56666 tcp ftp-data 0.112432 0 342 SF - 0 ShAdfFa 4 216 4 562 (empty) +16 52 12 02 21 CCvvfg3TEfuqmmG4bh 141.142.220.235 59378 199.233.217.249 56667 tcp ftp-data 0.111218 0 77 SF - 0 ShAdfFa 4 216 4 297 (empty) +16 53 12 02 21 CsRx2w45OKnoww6xl4 199.233.217.249 61920 141.142.220.235 33582 tcp ftp-data 0.056211 342 0 SF - 0 ShADaFf 5 614 3 164 (empty) +16 53 12 02 21 CRJuHdVW0XPVINV8a 199.233.217.249 61918 141.142.220.235 37835 tcp ftp-data 0.056005 77 0 SF - 0 ShADaFf 5 349 3 164 (empty) +16 52 12 02 21 CXWv6p3arKYeMETxOg 141.142.220.235 50003 199.233.217.249 21 tcp ftp 38.055625 180 3146 SF - 0 ShAdDfFa 38 2164 25 4458 (empty) diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-col-order b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-col-order index 4a39a899a5..0e3ce38d37 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-col-order +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-col-order @@ -7,11 +7,11 @@ #open 2014-04-01-23-15-49 #fields proto ts id.orig_h #types enum string addr -tcp 2012-02-21T08:52:55-0800 141.142.220.235 -tcp 2012-02-21T08:52:59-0800 141.142.220.235 -tcp 2012-02-21T08:53:14-0800 199.233.217.249 -tcp 2012-02-21T08:53:17-0800 199.233.217.249 -tcp 2012-02-21T08:52:41-0800 141.142.220.235 +tcp 2012-02-21T16:52:55+0000 141.142.220.235 +tcp 2012-02-21T16:52:59+0000 141.142.220.235 +tcp 2012-02-21T16:53:14+0000 199.233.217.249 +tcp 2012-02-21T16:53:17+0000 199.233.217.249 +tcp 2012-02-21T16:52:41+0000 141.142.220.235 #close 2014-04-01-23-15-49 #separator \x09 #set_separator , @@ -21,9 +21,9 @@ tcp 2012-02-21T08:52:41-0800 141.142.220.235 #open 2014-04-01-23-15-49 #fields proto ts id.orig_h #types enum string addr -tcp 2012-02-21T08:52:55-0800 141.142.220.235 -tcp 2012-02-21T08:52:59-0800 141.142.220.235 -tcp 2012-02-21T08:53:14-0800 199.233.217.249 -tcp 2012-02-21T08:53:17-0800 199.233.217.249 -tcp 2012-02-21T08:52:41-0800 141.142.220.235 +tcp 2012-02-21T16:52:55+0000 141.142.220.235 +tcp 2012-02-21T16:52:59+0000 141.142.220.235 +tcp 2012-02-21T16:53:14+0000 199.233.217.249 +tcp 2012-02-21T16:53:17+0000 199.233.217.249 +tcp 2012-02-21T16:52:41+0000 141.142.220.235 #close 2014-04-01-23-15-49 diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-field-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-field-separator index 743f3cdffa..813531df82 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-field-separator +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-field-separator @@ -7,11 +7,11 @@ #open 2014-04-01-23-15-49 #fields proto ts id.orig_h #types enum string addr -tcp 2012-02-21T08:52:55-0800 141.142.220.235 -tcp 2012-02-21T08:52:59-0800 141.142.220.235 -tcp 2012-02-21T08:53:14-0800 199.233.217.249 -tcp 2012-02-21T08:53:17-0800 199.233.217.249 -tcp 2012-02-21T08:52:41-0800 141.142.220.235 +tcp 2012-02-21T16:52:55+0000 141.142.220.235 +tcp 2012-02-21T16:52:59+0000 141.142.220.235 +tcp 2012-02-21T16:53:14+0000 199.233.217.249 +tcp 2012-02-21T16:53:17+0000 199.233.217.249 +tcp 2012-02-21T16:52:41+0000 141.142.220.235 #close 2014-04-01-23-15-49 #separator , #set_separator,, @@ -21,9 +21,9 @@ tcp 2012-02-21T08:52:41-0800 141.142.220.235 #open,2014-06-30-16-10-54 #fields,proto,ts,id.orig_h #types,enum,string,addr -tcp,2012-02-21T08:52:55-0800,141.142.220.235 -tcp,2012-02-21T08:52:59-0800,141.142.220.235 -tcp,2012-02-21T08:53:14-0800,199.233.217.249 -tcp,2012-02-21T08:52:41-0800,141.142.220.235 -tcp,2012-02-21T08:53:17-0800,199.233.217.249 +tcp,2012-02-21T16:52:55+0000,141.142.220.235 +tcp,2012-02-21T16:52:59+0000,141.142.220.235 +tcp,2012-02-21T16:53:14+0000,199.233.217.249 +tcp,2012-02-21T16:52:41+0000,141.142.220.235 +tcp,2012-02-21T16:53:17+0000,199.233.217.249 #close,2014-06-30-16-10-55 diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/missing-ts-one-file b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/missing-ts-one-file index dc72c7c5dc..a6aa5715b8 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/missing-ts-one-file +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/missing-ts-one-file @@ -7,11 +7,11 @@ #open 2014-04-01-23-15-49 #fields ts id.orig_h #types string addr -2012-02-21T08:52:55-0800 141.142.220.235 -2012-02-21T08:52:59-0800 141.142.220.235 -2012-02-21T08:53:14-0800 199.233.217.249 -2012-02-21T08:53:17-0800 199.233.217.249 -2012-02-21T08:52:41-0800 141.142.220.235 +2012-02-21T16:52:55+0000 141.142.220.235 +2012-02-21T16:52:59+0000 141.142.220.235 +2012-02-21T16:53:14+0000 199.233.217.249 +2012-02-21T16:53:17+0000 199.233.217.249 +2012-02-21T16:52:41+0000 141.142.220.235 #close 2014-04-01-23-15-49 #separator \x09 #set_separator , diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/multiple-times b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/multiple-times index e01fef6158..8ee0fad8c7 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/multiple-times +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/multiple-times @@ -7,8 +7,8 @@ #open 2014-04-01-23-16-29 #fields proto ts2 ts1 #types enum string string -tcp 2012-02-21T08:53:05-0800 2012-02-21T08:52:55-0800 -udp 2012-02-21T08:52:59-0800 2012-02-21T08:52:59-0800 -tcp 2012-02-21T08:53:24-0800 2012-02-21T08:53:14-0800 -tcp 2012-02-21T08:54:15-0800 2012-02-21T08:53:24-0800 +tcp 2012-02-21T16:53:05+0000 2012-02-21T16:52:55+0000 +udp 2012-02-21T16:52:59+0000 2012-02-21T16:52:59+0000 +tcp 2012-02-21T16:53:24+0000 2012-02-21T16:53:14+0000 +tcp 2012-02-21T16:54:15+0000 2012-02-21T16:53:24+0000 #close 2014-04-01-23-16-29 diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/nondefault-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/nondefault-separator index 580e4bf18f..b2cb75c4d3 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/nondefault-separator +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/nondefault-separator @@ -7,9 +7,9 @@ #open,2014-06-30-16-10-54 #fields,proto,ts,id.orig_h #types,enum,string,addr -tcp,2012-02-21T08:52:55-0800,141.142.220.235 -tcp,2012-02-21T08:52:59-0800,141.142.220.235 -tcp,2012-02-21T08:53:14-0800,199.233.217.249 -tcp,2012-02-21T08:52:41-0800,141.142.220.235 -tcp,2012-02-21T08:53:17-0800,199.233.217.249 +tcp,2012-02-21T16:52:55+0000,141.142.220.235 +tcp,2012-02-21T16:52:59+0000,141.142.220.235 +tcp,2012-02-21T16:53:14+0000,199.233.217.249 +tcp,2012-02-21T16:52:41+0000,141.142.220.235 +tcp,2012-02-21T16:53:17+0000,199.233.217.249 #close,2014-06-30-16-10-55 diff --git a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/ts-twice b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/ts-twice index e12215f6d7..fadaffd55f 100644 --- a/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/ts-twice +++ b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/ts-twice @@ -7,9 +7,9 @@ #open 2014-04-01-23-15-49 #fields ts id.orig_h ts #types string addr string -2012-02-21T08:52:55-0800 141.142.220.235 2012-02-21T08:52:55-0800 -2012-02-21T08:52:59-0800 141.142.220.235 2012-02-21T08:52:59-0800 -2012-02-21T08:53:14-0800 199.233.217.249 2012-02-21T08:53:14-0800 -2012-02-21T08:53:17-0800 199.233.217.249 2012-02-21T08:53:17-0800 -2012-02-21T08:52:41-0800 141.142.220.235 2012-02-21T08:52:41-0800 +2012-02-21T16:52:55+0000 141.142.220.235 2012-02-21T16:52:55+0000 +2012-02-21T16:52:59+0000 141.142.220.235 2012-02-21T16:52:59+0000 +2012-02-21T16:53:14+0000 199.233.217.249 2012-02-21T16:53:14+0000 +2012-02-21T16:53:17+0000 199.233.217.249 2012-02-21T16:53:17+0000 +2012-02-21T16:52:41+0000 141.142.220.235 2012-02-21T16:52:41+0000 #close 2014-04-01-23-15-49 diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg index 2bf145d4a7..ead5091882 100644 --- a/testing/btest/btest.cfg +++ b/testing/btest/btest.cfg @@ -21,7 +21,7 @@ TZ=UTC LC_ALL=C BTEST_PATH=%(testbase)s/../../auxil/btest BTEST_BG_RUN_SLEEP=0 -PATH=%(testbase)s/../../%(build_dir)s/src%(pathsep)s%(testbase)s/../scripts%(pathsep)s%(testbase)s/../../auxil/btest%(pathsep)s%(testbase)s/../../%(build_dir)s/auxil/zeek-aux/zeek-cut%(pathsep)s%(testbase)s/../../%(build_dir)s/auxil/spicy/bin%(pathsep)s%(testbase)s/../../%(build_dir)s/src/spicy/spicyz%(pathsep)s%(testbase)s/../../auxil/btest/sphinx%(pathsep)s%(default_path)s%(pathsep)s/sbin +PATH=%(testbase)s/../../%(build_dir)s/src%(pathsep)s%(testbase)s/../scripts%(pathsep)s%(testbase)s/../../auxil/btest%(pathsep)s%(testbase)s/../../%(build_dir)s/auxil/zeek-aux/zeek-cut%(pathsep)s%(testbase)s/../../%(build_dir)s/auxil/spicy/bin%(pathsep)s%(testbase)s/../../%(build_dir)s/src/spicy/spicyz%(pathsep)s%(testbase)s/../../auxil/btest/sphinx%(pathsep)s%(default_path)s%(pathsep)s/sbin%(pathsep)s%(testbase)s/../../%(build_dir)s/auxil/zeek-aux/zeek-archiver%(pathsep)s TRACES=%(testbase)s/Traces FILES=%(testbase)s/Files SCRIPTS=%(testbase)s/../scripts @@ -43,6 +43,7 @@ SPICY_PATH=`bash -c %(testbase)s/../../%(build_dir)s/spicy-path` HILTI_CXX_INCLUDE_DIRS=`bash -c %(testbase)s/../../%(build_dir)s/hilti-cxx-include-dirs` ZEEK_SPICY_MODULE_PATH=/does/not/exist ZEEK_SPICY_LIBRARY_PATH=%(testbase)s/../../scripts/spicy +ZEEK_AUX_LOGS=%(testbase)s/Files/zeek-aux-logs [environment-cpp] ZEEK_USE_CPP=1 diff --git a/testing/btest/zeek-aux/update-changes/changes-up-to-date.sh b/testing/btest/zeek-aux/update-changes/changes-up-to-date.sh index adae644de0..a6332bcd87 100644 --- a/testing/btest/zeek-aux/update-changes/changes-up-to-date.sh +++ b/testing/btest/zeek-aux/update-changes/changes-up-to-date.sh @@ -1,6 +1,4 @@ -# Test update-changes -c. On an absent repo, this should fail. When there have -# not been commits since the last CHANGES update, it should succeed, and after -# subsequent commits it should fail again. +# @TEST-DOC: Test update-changes -c. On an absent repo, this should fail. When there have not been commits since the last CHANGES update, it should succeed, and after subsequent commits it should fail again. # # @TEST-EXEC-FAIL: update-changes -c # @TEST-EXEC: bash %INPUT diff --git a/testing/btest/zeek-aux/update-changes/initialize-from-prompt.sh b/testing/btest/zeek-aux/update-changes/initialize-from-prompt.sh index 74c9e1bda6..7e585737e2 100644 --- a/testing/btest/zeek-aux/update-changes/initialize-from-prompt.sh +++ b/testing/btest/zeek-aux/update-changes/initialize-from-prompt.sh @@ -1,5 +1,4 @@ -# Test update-changes -I when no version information is present, and the user is -# prompted to provide one. +# @TEST-DOC: Test update-changes -I when no version information is present, and the user is prompted to provide one. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: test -f CHANGES diff --git a/testing/btest/zeek-aux/update-changes/initialize-from-tag.sh b/testing/btest/zeek-aux/update-changes/initialize-from-tag.sh index 421d8140ff..83cbe73253 100644 --- a/testing/btest/zeek-aux/update-changes/initialize-from-tag.sh +++ b/testing/btest/zeek-aux/update-changes/initialize-from-tag.sh @@ -1,4 +1,4 @@ -# Test update-changes -I when version information is available from git tags. +# @TEST-DOC: Test update-changes -I when version information is available from git tags. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: test -f CHANGES diff --git a/testing/btest/zeek-aux/update-changes/initialize-from-version.sh b/testing/btest/zeek-aux/update-changes/initialize-from-version.sh index 66d9cc2d91..f032d67baf 100644 --- a/testing/btest/zeek-aux/update-changes/initialize-from-version.sh +++ b/testing/btest/zeek-aux/update-changes/initialize-from-version.sh @@ -1,5 +1,4 @@ -# Test update-changes -I when version information is in the VERSION file, which -# update-changes wants confirmation for. +# @TEST-DOC: Test update-changes -I when version information is in the VERSION file, which update-changes wants confirmation for. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: test -f CHANGES diff --git a/testing/btest/zeek-aux/update-changes/replace-version-in-c-header.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-c-header.sh index 0639f010ef..c4ea852a2d 100644 --- a/testing/btest/zeek-aux/update-changes/replace-version-in-c-header.sh +++ b/testing/btest/zeek-aux/update-changes/replace-version-in-c-header.sh @@ -1,15 +1,14 @@ -# Verifies that update-changes correctly updates version strings in C header -# files, when .update-changes.cfg instructs it. +# @TEST-DOC: Verifies that update-changes correctly updates version strings in C header files, when .update-changes.cfg instructs it. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: btest-diff header.h -@TEST-START-FILE .update-changes.cfg +# @TEST-START-FILE .update-changes.cfg function new_version_hook() { local version=$1 replace_version_in_c_header header.h $version } -@TEST-END-FILE +# @TEST-END-FILE git init diff --git a/testing/btest/zeek-aux/update-changes/replace-version-in-python-package.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-python-package.sh index 9479097a89..486971a552 100644 --- a/testing/btest/zeek-aux/update-changes/replace-version-in-python-package.sh +++ b/testing/btest/zeek-aux/update-changes/replace-version-in-python-package.sh @@ -1,15 +1,14 @@ -# Verifies that update-changes correctly updates __version__ values as given in -# package-level __init__.py files, when .update-changes.cfg instructs it. +# @TEST-DOC: Verifies that update-changes correctly updates __version__ values as given in package-level __init__.py files, when .update-changes.cfg instructs it. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: btest-diff __init__.py -@TEST-START-FILE .update-changes.cfg +# @TEST-START-FILE .update-changes.cfg function new_version_hook() { local version=$1 replace_version_in_python_package __init__.py $version } -@TEST-END-FILE +# @TEST-END-FILE git init diff --git a/testing/btest/zeek-aux/update-changes/replace-version-in-rst.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-rst.sh index 3c38bc8db4..233b89e9c4 100644 --- a/testing/btest/zeek-aux/update-changes/replace-version-in-rst.sh +++ b/testing/btest/zeek-aux/update-changes/replace-version-in-rst.sh @@ -1,15 +1,14 @@ -# Verifies that update-changes correctly updates version strings in -# ReST docs, when .update-changes.cfg instructs it. +# @TEST-DOC: Verifies that update-changes correctly updates version strings in ReST docs, when .update-changes.cfg instructs it. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: btest-diff test.rst -@TEST-START-FILE .update-changes.cfg +# @TEST-START-FILE .update-changes.cfg function new_version_hook() { local version=$1 replace_version_in_rst test.rst $version } -@TEST-END-FILE +# @TEST-END-FILE git init diff --git a/testing/btest/zeek-aux/update-changes/replace-version-in-script.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-script.sh index 4cc35fec8c..8341c5be87 100644 --- a/testing/btest/zeek-aux/update-changes/replace-version-in-script.sh +++ b/testing/btest/zeek-aux/update-changes/replace-version-in-script.sh @@ -1,15 +1,14 @@ -# Verifies that update-changes correctly updates version strings in -# shell/Python/etc scripts, when .update-changes.cfg instructs it. +# @TEST-DOC: Verifies that update-changes correctly updates version strings in shell/Python/etc scripts, when .update-changes.cfg instructs it. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: btest-diff test.pl -@TEST-START-FILE .update-changes.cfg +# @TEST-START-FILE .update-changes.cfg function new_version_hook() { local version=$1 replace_version_in_script test.pl $version } -@TEST-END-FILE +# @TEST-END-FILE git init diff --git a/testing/btest/zeek-aux/update-changes/replace-version-in-setup-py.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-setup-py.sh index 841ee9ac2f..c54907fc77 100644 --- a/testing/btest/zeek-aux/update-changes/replace-version-in-setup-py.sh +++ b/testing/btest/zeek-aux/update-changes/replace-version-in-setup-py.sh @@ -1,15 +1,14 @@ -# Verifies that update-changes correctly updates version strings in setup.py -# files to Python-style versions, when .update-changes.cfg instructs it. +# @TEST-DOC: Verifies that update-changes correctly updates version strings in setup.py files to Python-style versions, when .update-changes.cfg instructs it. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: btest-diff setup.py -@TEST-START-FILE .update-changes.cfg +# @TEST-START-FILE .update-changes.cfg function new_version_hook() { local version=$1 replace_version_in_setup_py setup.py $version } -@TEST-END-FILE +# @TEST-END-FILE git init diff --git a/testing/btest/zeek-aux/update-changes/tag-dev-point-release-ahead-of-origin.sh b/testing/btest/zeek-aux/update-changes/tag-dev-point-release-ahead-of-origin.sh index a3c7a28bd4..1bd6fcf218 100644 --- a/testing/btest/zeek-aux/update-changes/tag-dev-point-release-ahead-of-origin.sh +++ b/testing/btest/zeek-aux/update-changes/tag-dev-point-release-ahead-of-origin.sh @@ -1,5 +1,4 @@ -# Like tag-point-release-ahead-of-origin, but on top of a "-dev" git tag -# to test the underlying -r regex. +# @TEST-DOC: Like tag-point-release-ahead-of-origin, but on top of a "-dev" git tag to test the underlying -r regex. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: cd clone && git describe --exact-match HEAD | grep -q v1.0.1 diff --git a/testing/btest/zeek-aux/update-changes/tag-point-release-ahead-of-origin.sh b/testing/btest/zeek-aux/update-changes/tag-point-release-ahead-of-origin.sh index 7405f4b7d6..4b42d20c70 100644 --- a/testing/btest/zeek-aux/update-changes/tag-point-release-ahead-of-origin.sh +++ b/testing/btest/zeek-aux/update-changes/tag-point-release-ahead-of-origin.sh @@ -1,5 +1,4 @@ -# Test update-changes -r when the repo is cloned from an origin. With commits -# ahead of CHANGES, the release commit should be augmented onto the last. +# @TEST-DOC: Test update-changes -r when the repo is cloned from an origin. With commits ahead of CHANGES, the release commit should be augmented onto the last. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: cd clone && git describe --exact-match HEAD | grep -q v1.0.1 diff --git a/testing/btest/zeek-aux/update-changes/tag-point-release-at-origin.sh b/testing/btest/zeek-aux/update-changes/tag-point-release-at-origin.sh index 1f5e66735c..afc89fd121 100644 --- a/testing/btest/zeek-aux/update-changes/tag-point-release-at-origin.sh +++ b/testing/btest/zeek-aux/update-changes/tag-point-release-at-origin.sh @@ -1,5 +1,4 @@ -# Test update-changes -r when the repo is up to date with its origin. In that -# case, the release commit should become a new one. +# @TEST-DOC: Test update-changes -r when the repo is up to date with its origin. In that case, the release commit should become a new one. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: cd clone && git describe --exact-match HEAD | grep -q v1.0.1 diff --git a/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin-new-commit.sh b/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin-new-commit.sh index 806b83d198..eccbb2d418 100644 --- a/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin-new-commit.sh +++ b/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin-new-commit.sh @@ -1,6 +1,4 @@ -# Test update-changes -R when the repo is cloned from an origin. With commits -# ahead of CHANGES the release commit would be augmented onto the last, but -# this also uses -n to create a new one. +# @TEST-DOC: Test update-changes -R when the repo is cloned from an origin. With commits ahead of CHANGES the release commit would be augmented onto the last, but this also uses -n to create a new one. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: cd clone && git describe --exact-match HEAD | grep -q v2.0.0 diff --git a/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin.sh b/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin.sh index 5e741f025b..22833283dd 100644 --- a/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin.sh +++ b/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin.sh @@ -1,5 +1,4 @@ -# Test update-changes -R when the repo is cloned from an origin. With commits -# ahead of CHANGES the release commit should be augmented onto the last. +# @TEST-DOC: Test update-changes -R when the repo is cloned from an origin. With commits ahead of CHANGES the release commit should be augmented onto the last. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: cd clone && git describe --exact-match HEAD | grep -q v2.0.0 diff --git a/testing/btest/zeek-aux/update-changes/tag-release-at-origin.sh b/testing/btest/zeek-aux/update-changes/tag-release-at-origin.sh index 2456aa64dc..968551c1b8 100644 --- a/testing/btest/zeek-aux/update-changes/tag-release-at-origin.sh +++ b/testing/btest/zeek-aux/update-changes/tag-release-at-origin.sh @@ -1,5 +1,4 @@ -# Test update-changes -R when the repo is up to date with its origin. In that -# case, the release commit should become a new one. +# @TEST-DOC: Test update-changes -R when the repo is up to date with its origin. In that case, the release commit should become a new one. # # @TEST-EXEC: bash %INPUT # @TEST-EXEC: cd clone && git describe --exact-match HEAD | grep -q v2.0.0 diff --git a/testing/btest/zeek-aux/zeek-archiver/command-injection-filenames.test b/testing/btest/zeek-aux/zeek-archiver/command-injection-filenames.test index 79d60e0e82..461e89777e 100644 --- a/testing/btest/zeek-aux/zeek-archiver/command-injection-filenames.test +++ b/testing/btest/zeek-aux/zeek-archiver/command-injection-filenames.test @@ -1,7 +1,7 @@ -# Verify that commands injected via filenames do not execute. +# @TEST-DOC: Verify that commands injected via filenames do not execute. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in='test;uptime;__2020-07-16-09-43-10__2020-07-16-09-43-10__.log' log_out='test;uptime;.09:43:10-09:43:10.log' diff --git a/testing/btest/zeek-aux/zeek-archiver/custom-delimiter.test b/testing/btest/zeek-aux/zeek-archiver/custom-delimiter.test index 3ac3e5847e..c5ef85f423 100644 --- a/testing/btest/zeek-aux/zeek-archiver/custom-delimiter.test +++ b/testing/btest/zeek-aux/zeek-archiver/custom-delimiter.test @@ -1,7 +1,7 @@ -# Use a custom delimiter in the resulting logs. +# @TEST-DOC: Use a custom delimiter in the resulting logs. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test_2020-07-16-09-43-10_2020-07-16-09-43-10_.log log_out=test.09:43:10-09:43:10.log diff --git a/testing/btest/zeek-aux/zeek-archiver/custom-timestamp.test b/testing/btest/zeek-aux/zeek-archiver/custom-timestamp.test index bf03e60b08..a97a0ab8ad 100644 --- a/testing/btest/zeek-aux/zeek-archiver/custom-timestamp.test +++ b/testing/btest/zeek-aux/zeek-archiver/custom-timestamp.test @@ -1,7 +1,7 @@ -# Use a customized timestamp in output logs. +# @TEST-DOC: Use a customized timestamp in output logs. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16_09-43-10__2020-07-16_09-43-10__.log log_out=test.09:43:10-09:43:10.log diff --git a/testing/btest/zeek-aux/zeek-archiver/default.test b/testing/btest/zeek-aux/zeek-archiver/default.test index ce7cb7a24c..56d473222e 100644 --- a/testing/btest/zeek-aux/zeek-archiver/default.test +++ b/testing/btest/zeek-aux/zeek-archiver/default.test @@ -1,7 +1,7 @@ -# Default behavior: compress the log. +# @TEST-DOC: Default behavior: compress the log. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10__.log log_out=test.09:43:10-09:43:10.log diff --git a/testing/btest/zeek-aux/zeek-archiver/disable-compression.test b/testing/btest/zeek-aux/zeek-archiver/disable-compression.test index eca7d5c327..eac068aa8a 100644 --- a/testing/btest/zeek-aux/zeek-archiver/disable-compression.test +++ b/testing/btest/zeek-aux/zeek-archiver/disable-compression.test @@ -1,7 +1,7 @@ -# Don't compress the logs. +# @TEST-DOC: Don't compress the logs. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10__.log log_out=test.09:43:10-09:43:10.log diff --git a/testing/btest/zeek-aux/zeek-archiver/extra-compression-args.test b/testing/btest/zeek-aux/zeek-archiver/extra-compression-args.test index 65781240b4..8f6aaae080 100644 --- a/testing/btest/zeek-aux/zeek-archiver/extra-compression-args.test +++ b/testing/btest/zeek-aux/zeek-archiver/extra-compression-args.test @@ -1,7 +1,7 @@ -# Verify that passing extra parameters to the compression stage works. +# @TEST-DOC: Verify that passing extra parameters to the compression stage works. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10__.log log_out=test.09:43:10-09:43:10.log diff --git a/testing/btest/zeek-aux/zeek-archiver/failing-compress.test b/testing/btest/zeek-aux/zeek-archiver/failing-compress.test index 259b6f64b1..c49c57268b 100644 --- a/testing/btest/zeek-aux/zeek-archiver/failing-compress.test +++ b/testing/btest/zeek-aux/zeek-archiver/failing-compress.test @@ -1,8 +1,7 @@ -# Verify the source file still exists and the destination wasn't created -# (or removed) when the compression command fails. +# @TEST-DOC: Verify the source file still exists and the destination wasn't created (or removed) when the compression command fails. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10__.log log_out=test.09:43:10-09:43:10.log diff --git a/testing/btest/zeek-aux/zeek-archiver/metadata-addl.test b/testing/btest/zeek-aux/zeek-archiver/metadata-addl.test index 524409f02e..7d349bd7c7 100644 --- a/testing/btest/zeek-aux/zeek-archiver/metadata-addl.test +++ b/testing/btest/zeek-aux/zeek-archiver/metadata-addl.test @@ -1,7 +1,7 @@ -# Verify log name metadata behavior: check that additional pid metadata gets dropped. +# @TEST-DOC: Verify log name metadata behavior: check that additional pid metadata gets dropped. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10__log_suffix=logger-test,pid=4711__.log log_out=test.09:43:10-09:43:10-logger-test.log diff --git a/testing/btest/zeek-aux/zeek-archiver/metadata-empty.test b/testing/btest/zeek-aux/zeek-archiver/metadata-empty.test index ff9860d605..efada6145c 100644 --- a/testing/btest/zeek-aux/zeek-archiver/metadata-empty.test +++ b/testing/btest/zeek-aux/zeek-archiver/metadata-empty.test @@ -1,7 +1,7 @@ -# Verify log name metadata behavior: empty metadata is acceptable. +# @TEST-DOC: Verify log name metadata behavior: empty metadata is acceptable. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10____.log log_out=test.09:43:10-09:43:10.log diff --git a/testing/btest/zeek-aux/zeek-archiver/metadata-invalid.test b/testing/btest/zeek-aux/zeek-archiver/metadata-invalid.test index 11d2dad26f..1892f3d74a 100644 --- a/testing/btest/zeek-aux/zeek-archiver/metadata-invalid.test +++ b/testing/btest/zeek-aux/zeek-archiver/metadata-invalid.test @@ -1,13 +1,14 @@ -# Verify log name metadata behavior: invalid metadata causes skipping of archival. +# @TEST-DOC: Verify log name metadata behavior: invalid metadata causes skipping of archival. # @TEST-EXEC: bash %INPUT -@TEST-START-FILE run.sh -. "$SCRIPTS/zeek-archiver-common.sh" +# @TEST-START-FILE run.sh + +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" echo hello > "$(queue_dir)/${log_in}" zeek-archiver -1 -v "$(queue_dir)" "$(archive_dir)" test -f "$(queue_dir)/${log_in}" -@TEST-END-FILE +# @TEST-END-FILE log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10__log_suffix,invalid=4711__.log . run.sh diff --git a/testing/btest/zeek-aux/zeek-archiver/metadata.test b/testing/btest/zeek-aux/zeek-archiver/metadata.test index 8add2e390f..25608a6ac8 100644 --- a/testing/btest/zeek-aux/zeek-archiver/metadata.test +++ b/testing/btest/zeek-aux/zeek-archiver/metadata.test @@ -1,7 +1,7 @@ -# Verify log name metadata behavior: check that suffixes get applied correctly. +# @TEST-DOC: Verify log name metadata behavior: check that suffixes get applied correctly. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10__log_suffix=logger-test__.log log_out=test.09:43:10-09:43:10-logger-test.log diff --git a/testing/btest/zeek-aux/zeek-archiver/pre-compression-logs.test b/testing/btest/zeek-aux/zeek-archiver/pre-compression-logs.test index 6a9ec6a9be..0a9f25409d 100644 --- a/testing/btest/zeek-aux/zeek-archiver/pre-compression-logs.test +++ b/testing/btest/zeek-aux/zeek-archiver/pre-compression-logs.test @@ -1,7 +1,7 @@ -# Detect pre-compressed logs. +# @TEST-DOC: Detect pre-compressed logs. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" log_in=test__2020-07-16-09-43-10__2020-07-16-09-43-10__.log log_out=test.09:43:10-09:43:10.log diff --git a/testing/btest/zeek-aux/zeek-archiver/umask.test b/testing/btest/zeek-aux/zeek-archiver/umask.test index ef64629de3..e481460ba6 100644 --- a/testing/btest/zeek-aux/zeek-archiver/umask.test +++ b/testing/btest/zeek-aux/zeek-archiver/umask.test @@ -1,7 +1,7 @@ # @TEST-DOC: Check file permissions with different umask settings. # @TEST-EXEC: bash %INPUT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" umask 0002 @@ -19,7 +19,7 @@ test "${file_perms}" == "-rw-rw-r--" || exit 1 # @TEST-START-NEXT -. "$SCRIPTS/zeek-archiver-common.sh" +. "${SCRIPTS}/zeek-aux/zeek-archiver-common.sh" umask 0077 diff --git a/testing/btest/zeek-aux/zeek-cut/bad-logs.test b/testing/btest/zeek-aux/zeek-cut/bad-logs.test index 00bb132e4c..532be3929e 100644 --- a/testing/btest/zeek-aux/zeek-cut/bad-logs.test +++ b/testing/btest/zeek-aux/zeek-cut/bad-logs.test @@ -1,30 +1,30 @@ -# Test zeek-cut with invalid log files. +# @TEST-DOC: Test zeek-cut with invalid log files. # # The "#separator" log header line is missing. -# @TEST-EXEC: grep -v '^#separator' $LOGS/conn.log | zeek-cut uid proto > missing-sep-header +# @TEST-EXEC: grep -v '^#separator' ${ZEEK_AUX_LOGS}/conn.log | zeek-cut uid proto > missing-sep-header # @TEST-EXEC: btest-diff missing-sep-header # The "#fields" log header line is missing (show header). -# @TEST-EXEC-FAIL: grep -v '^#fields' $LOGS/conn.log | zeek-cut -C 2> missing-fields-header +# @TEST-EXEC-FAIL: grep -v '^#fields' ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -C 2> missing-fields-header # @TEST-EXEC: btest-diff missing-fields-header # All log header lines are missing (show header). -# @TEST-EXEC: grep -v '^#' $LOGS/conn.log | zeek-cut -c > no-header-show +# @TEST-EXEC: grep -v '^#' ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -c > no-header-show # @TEST-EXEC: btest-diff no-header-show # All log header lines are missing (select column to show). -# @TEST-EXEC: grep -v '^#' $LOGS/conn.log | zeek-cut uid > no-header-column +# @TEST-EXEC: grep -v '^#' ${ZEEK_AUX_LOGS}/conn.log | zeek-cut uid > no-header-column # @TEST-EXEC: btest-diff no-header-column # All log header lines are missing (select column to not show). -# @TEST-EXEC: grep -v '^#' $LOGS/conn.log | zeek-cut -n uid > no-header-not-column +# @TEST-EXEC: grep -v '^#' ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -n uid > no-header-not-column # @TEST-EXEC: btest-diff no-header-not-column # Separator is missing -# @TEST-EXEC-FAIL: cat $LOGS/missing-separator.log | zeek-cut 2> missing-separator +# @TEST-EXEC-FAIL: cat ${ZEEK_AUX_LOGS}/missing-separator.log | zeek-cut 2> missing-separator # @TEST-EXEC: btest-diff missing-separator # Separator is \x00 -# @TEST-EXEC-FAIL: cat $LOGS/null-separator.log | zeek-cut 2> null-separator +# @TEST-EXEC-FAIL: cat ${ZEEK_AUX_LOGS}/null-separator.log | zeek-cut 2> null-separator # @TEST-EXEC: btest-diff null-separator diff --git a/testing/btest/zeek-aux/zeek-cut/columns.test b/testing/btest/zeek-aux/zeek-cut/columns.test index 031906d44f..649a6db1ec 100644 --- a/testing/btest/zeek-aux/zeek-cut/columns.test +++ b/testing/btest/zeek-aux/zeek-cut/columns.test @@ -1,34 +1,34 @@ -# Test zeek-cut with column names, but no other options. +# @TEST-DOC: Test zeek-cut with column names, but no other options. # # Select one column. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut uid > one -# @TEST-EXEC: btest-diff one +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut uid > one +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff one # Log file has only one column. -# @TEST-EXEC: cat $LOGS/onecolumn.log | zeek-cut id.orig_h > only -# @TEST-EXEC: btest-diff only +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/onecolumn.log | zeek-cut id.orig_h > only +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff only # Swap the order of two columns. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut proto uid > swap-order -# @TEST-EXEC: btest-diff swap-order +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut proto uid > swap-order +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff swap-order # Specify all columns in the log file. -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut ts uid id.orig_h id.orig_p id.resp_h > all -# @TEST-EXEC: btest-diff all +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut ts uid id.orig_h id.orig_p id.resp_h > all +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff all # Log files use different field separators. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conncomma.log | zeek-cut 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 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 ts uid > 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 ts uid > different-col-order +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff different-col-order # Specify a column name that exists only in the first log file. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut uid proto > one-nonexistent-1 -# @TEST-EXEC: btest-diff one-nonexistent-1 +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut uid proto > one-nonexistent-1 +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff one-nonexistent-1 # Specify a column name that exists only in the second log file. -# @TEST-EXEC: cat $LOGS/test.log $LOGS/conn.log | zeek-cut uid proto > one-nonexistent-2 -# @TEST-EXEC: btest-diff one-nonexistent-2 +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log ${ZEEK_AUX_LOGS}/conn.log | zeek-cut uid proto > one-nonexistent-2 +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff one-nonexistent-2 diff --git a/testing/btest/zeek-aux/zeek-cut/help.test b/testing/btest/zeek-aux/zeek-cut/help.test index d605efe81c..cfa8f52f0f 100644 --- a/testing/btest/zeek-aux/zeek-cut/help.test +++ b/testing/btest/zeek-aux/zeek-cut/help.test @@ -1,4 +1,4 @@ -# Test zeek-cut with -h option. +# @TEST-DOC: Test zeek-cut with -h option. # # @TEST-EXEC-FAIL: zeek-cut -h > show-help # @TEST-EXEC: btest-diff show-help diff --git a/testing/btest/zeek-aux/zeek-cut/minimal-view.test b/testing/btest/zeek-aux/zeek-cut/minimal-view.test index 6f434570c8..0c7826d3ae 100644 --- a/testing/btest/zeek-aux/zeek-cut/minimal-view.test +++ b/testing/btest/zeek-aux/zeek-cut/minimal-view.test @@ -1,50 +1,50 @@ -# Test zeek-cut with -m and -M options. +# @TEST-DOC: Test zeek-cut with -m and -M options. # # Show first header in minimal view for one log file. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -m > one-all-nocols -# @TEST-EXEC: btest-diff one-all-nocols +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -m > one-all-nocols +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff one-all-nocols # Show first header in minimal view for two log files. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -m 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 -m uid ts > two-1st-withcols +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff two-1st-withcols # Show all headers in minimal view for two log files. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -M 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 -M uid ts > two-all-withcols +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff two-all-withcols # # Show first header in minimal view for two log files with custom field separator. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -F, -m uid ts > two-1st-withcols-custom-sep -# @TEST-EXEC: btest-diff two-1st-withcols-custom-sep +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -F, -m uid ts > two-1st-withcols-custom-sep +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff two-1st-withcols-custom-sep # Show all headers in minimal view for two log files with custom field separator. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -F, -M uid ts > two-all-withcols-custom-sep -# @TEST-EXEC: btest-diff two-all-withcols-custom-sep +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -F, -M uid ts > two-all-withcols-custom-sep +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff two-all-withcols-custom-sep # Show all headers in minimal view for two logs (-M overrides -m). -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -m -M uid ts > both-m-opts-all -# @TEST-EXEC: btest-diff both-m-opts-all +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -m -M uid ts > both-m-opts-all +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff both-m-opts-all # Show first header in minimal view for two logs (-m overrides -M). -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -M -m uid ts > both-m-opts-one -# @TEST-EXEC: btest-diff both-m-opts-one +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -M -m uid ts > both-m-opts-one +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff both-m-opts-one # Show first header in minimal view for two logs (-m overrides -C). -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -C -m uid ts > both-c-m-opts-m -# @TEST-EXEC: btest-diff both-c-m-opts-m +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -C -m uid ts > both-c-m-opts-m +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff both-c-m-opts-m # Show all headers for two logs (-c overrides -M). -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/test.log | zeek-cut -M -c uid ts > both-m-c-opts-c -# @TEST-EXEC: btest-diff both-m-c-opts-c +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/test.log | zeek-cut -M -c uid ts > both-m-c-opts-c +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff both-m-c-opts-c # Log files use different field separators. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conncomma.log | zeek-cut -M 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 -M 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 -M > 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 -M > 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 -M 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 -M ts uid > different-col-order-some +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff different-col-order-some diff --git a/testing/btest/zeek-aux/zeek-cut/no-options.test b/testing/btest/zeek-aux/zeek-cut/no-options.test index a2a641fdd9..443d9ef06b 100644 --- a/testing/btest/zeek-aux/zeek-cut/no-options.test +++ b/testing/btest/zeek-aux/zeek-cut/no-options.test @@ -1,9 +1,9 @@ -# Test zeek-cut without any command-line options. +# @TEST-DOC: Test zeek-cut without any command-line options. # -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut > no-opts -# @TEST-EXEC: btest-diff no-opts +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut > no-opts +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff no-opts # Log file in "tsv" (tab-separated-values) format. -# @TEST-EXEC: cat $LOGS/conn-tsv.log | zeek-cut > tsv -# @TEST-EXEC: btest-diff tsv +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn-tsv.log | zeek-cut > tsv +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff tsv diff --git a/testing/btest/zeek-aux/zeek-cut/not-columns.test b/testing/btest/zeek-aux/zeek-cut/not-columns.test index e7356e9d5d..f32537e44a 100644 --- a/testing/btest/zeek-aux/zeek-cut/not-columns.test +++ b/testing/btest/zeek-aux/zeek-cut/not-columns.test @@ -1,38 +1,38 @@ -# Test zeek-cut with the -n option. +# @TEST-DOC: Test zeek-cut with the -n option. # # Show all columns but one. -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut -n uid > not-one -# @TEST-EXEC: btest-diff not-one +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut -n uid > not-one +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff not-one # Show all columns but two (and specify them in swapped order). -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut -n id.resp_h uid > not-two-swapped -# @TEST-EXEC: btest-diff not-two-swapped +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut -n id.resp_h uid > not-two-swapped +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff not-two-swapped # Show all columns but one, but specify the same column twice. -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut -n uid uid > not-one-twice -# @TEST-EXEC: btest-diff not-one-twice +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut -n uid uid > not-one-twice +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff not-one-twice # Column order changes between two log files. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conntimelast.log | zeek-cut -n ts uid > 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 -n ts uid > different-col-order +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff different-col-order # Don't show any columns. -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut -n ts uid id.orig_h id.orig_p id.resp_h > not-all -# @TEST-EXEC: btest-diff not-all +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut -n ts uid id.orig_h id.orig_p id.resp_h > not-all +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff not-all # Don't show the only column in the log. -# @TEST-EXEC: cat $LOGS/onecolumn.log | zeek-cut -n id.orig_h > not-only -# @TEST-EXEC: btest-diff not-only +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/onecolumn.log | zeek-cut -n id.orig_h > not-only +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff not-only # Don't exclude any columns. -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut -n > not-none -# @TEST-EXEC: btest-diff not-none +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut -n > not-none +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff not-none # Show all columns but one, and also specify a nonexistent column name. -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut -n uid proto > not-one-nonexistent -# @TEST-EXEC: btest-diff not-one-nonexistent +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut -n uid proto > not-one-nonexistent +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff not-one-nonexistent # Show that the -n option also affects the header. -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut -c -n uid > not-one-show-header -# @TEST-EXEC: btest-diff not-one-show-header +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut -c -n uid > not-one-show-header +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff not-one-show-header diff --git a/testing/btest/zeek-aux/zeek-cut/ofs.test b/testing/btest/zeek-aux/zeek-cut/ofs.test index 48914ade0c..686c69224c 100644 --- a/testing/btest/zeek-aux/zeek-cut/ofs.test +++ b/testing/btest/zeek-aux/zeek-cut/ofs.test @@ -1,18 +1,18 @@ -# Test zeek-cut with -F option. +# @TEST-DOC: Test zeek-cut with -F option. # # Use a different field separator on two columns. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -F , uid ts > some-columns -# @TEST-EXEC: btest-diff some-columns +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -F , uid ts > some-columns +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff some-columns # Show that -F option is used even when field separator in log files changes. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conncomma.log | zeek-cut -F : 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 -F : proto uid > nondefault-separator +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff nondefault-separator # Field separator is not relevant because log has only one column. -# @TEST-EXEC: cat $LOGS/onecolumn.log | zeek-cut -F , > only-column -# @TEST-EXEC: btest-diff only-column +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/onecolumn.log | zeek-cut -F , > only-column +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff only-column # Show header and use a different field separator. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -F . -c > show-header -# @TEST-EXEC: btest-diff show-header +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -F . -c > show-header +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff show-header diff --git a/testing/btest/zeek-aux/zeek-cut/show-header.test b/testing/btest/zeek-aux/zeek-cut/show-header.test index e0098e5c83..a50d56ba30 100644 --- a/testing/btest/zeek-aux/zeek-cut/show-header.test +++ b/testing/btest/zeek-aux/zeek-cut/show-header.test @@ -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 diff --git a/testing/btest/zeek-aux/zeek-cut/time-bad-logs.test b/testing/btest/zeek-aux/zeek-cut/time-bad-logs.test index 47ffc55df2..220030944a 100644 --- a/testing/btest/zeek-aux/zeek-cut/time-bad-logs.test +++ b/testing/btest/zeek-aux/zeek-cut/time-bad-logs.test @@ -1,15 +1,15 @@ -# Test zeek-cut time conversion with invalid log files. +# @TEST-DOC: Test zeek-cut time conversion with invalid log files. # # The "#types" log header line is missing. -# @TEST-EXEC-FAIL: grep -v '^#types' $LOGS/conn.log | zeek-cut -d 2> missing-types-header +# @TEST-EXEC-FAIL: grep -v '^#types' ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -d 2> missing-types-header # @TEST-EXEC: btest-diff missing-types-header # All log header lines are missing. -# @TEST-EXEC: grep -v '^#' $LOGS/conn.log | zeek-cut -d > no-header-time +# @TEST-EXEC: grep -v '^#' ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -d > no-header-time # @TEST-EXEC: btest-diff no-header-time # Time field is invalid or out of range -# @TEST-EXEC: cat $LOGS/invalid-time.log | zeek-cut -d > invalid-time-field 2> invalid-time-field.err +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/invalid-time.log | zeek-cut -d > invalid-time-field 2> invalid-time-field.err # @TEST-EXEC: btest-diff invalid-time-field # @TEST-EXEC: btest-diff invalid-time-field.err diff --git a/testing/btest/zeek-aux/zeek-cut/time-conversion.test b/testing/btest/zeek-aux/zeek-cut/time-conversion.test index 3878e65dfb..5d47a44c08 100644 --- a/testing/btest/zeek-aux/zeek-cut/time-conversion.test +++ b/testing/btest/zeek-aux/zeek-cut/time-conversion.test @@ -1,42 +1,42 @@ -# Test zeek-cut with time conversion options (-d/-u). +# @TEST-DOC: Test zeek-cut with time conversion options (-d/-u). # # Test -d option. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -d > local +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -d > local # @TEST-EXEC: btest-diff local # Test -u option. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -u > utc -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-time-zone btest-diff utc +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -u > utc +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/zeek-aux/diff-time-zone btest-diff utc -# Test that -u can override -d. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -d -u > both-1 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-time-zone btest-diff both-1 +# Test that -u can override -d. +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -d -u > both-1 +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/zeek-aux/diff-time-zone btest-diff both-1 -# Test that -d can override -u. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -u -d > both-2 +# Test that -d can override -u. +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -u -d > both-2 # @TEST-EXEC: btest-diff both-2 # First time value is zero. -# @TEST-EXEC: cat $LOGS/zerotime.log | zeek-cut -u > zero -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-time-zone btest-diff zero +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/zerotime.log | zeek-cut -u > zero +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/zeek-aux/diff-time-zone btest-diff zero # File has timestamp, but not in the first column. -# @TEST-EXEC: cat $LOGS/conntimelast.log | zeek-cut -d > time-last-col +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conntimelast.log | zeek-cut -d > time-last-col # @TEST-EXEC: btest-diff time-last-col # File has more than one time column, and some timestamps are duplicates. -# @TEST-EXEC: cat $LOGS/multiple-times.log | zeek-cut -d > multiple-times +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/multiple-times.log | zeek-cut -d > multiple-times # @TEST-EXEC: btest-diff multiple-times # Column order changes between two log files. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conntimelast.log | zeek-cut -d > different-col-order +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/conntimelast.log | zeek-cut -d > different-col-order # @TEST-EXEC: btest-diff different-col-order # File has no timestamps. -# @TEST-EXEC: cat $LOGS/onecolumn.log | zeek-cut -d > no-timestamps +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/onecolumn.log | zeek-cut -d > no-timestamps # @TEST-EXEC: btest-diff no-timestamps # Input is missing the log header lines. -# @TEST-EXEC: grep -v '^#' $LOGS/conn.log | zeek-cut -d > missing-header +# @TEST-EXEC: grep -v '^#' ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -d > missing-header # @TEST-EXEC: btest-diff missing-header diff --git a/testing/btest/zeek-aux/zeek-cut/time-fmt-env.test b/testing/btest/zeek-aux/zeek-cut/time-fmt-env.test index 57d959bf69..e7212515c7 100644 --- a/testing/btest/zeek-aux/zeek-cut/time-fmt-env.test +++ b/testing/btest/zeek-aux/zeek-cut/time-fmt-env.test @@ -1,18 +1,18 @@ -# Test zeek-cut with ZEEK_CUT_TIMEFMT environment variable. +# @TEST-DOC: Test zeek-cut with ZEEK_CUT_TIMEFMT environment variable. # # Output local time with format from environment. -# @TEST-EXEC: cat $LOGS/conn.log | ZEEK_CUT_TIMEFMT="%H%M_%y%m%d" zeek-cut -d > env-local +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | ZEEK_CUT_TIMEFMT="%H%M_%y%m%d" zeek-cut -d > env-local # @TEST-EXEC: btest-diff env-local # Output UTC with format from environment. -# @TEST-EXEC: cat $LOGS/conn.log | ZEEK_CUT_TIMEFMT="%H%M_%y%m%d" zeek-cut -u > env-utc +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | ZEEK_CUT_TIMEFMT="%H%M_%y%m%d" zeek-cut -u > env-utc # @TEST-EXEC: btest-diff env-utc # The "-D" option overrides environment variable. -# @TEST-EXEC: cat $LOGS/conn.log | ZEEK_CUT_TIMEFMT="%H%M_%y%m%d" zeek-cut -D "%H %M %y %m %d" > env-local-fmt +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | ZEEK_CUT_TIMEFMT="%H%M_%y%m%d" zeek-cut -D "%H %M %y %m %d" > env-local-fmt # @TEST-EXEC: btest-diff env-local-fmt # The "-U" option overrides environment variable. -# @TEST-EXEC: cat $LOGS/conn.log | ZEEK_CUT_TIMEFMT="%H%M_%y%m%d" zeek-cut -U "%H %M %y %m %d" > env-utc-fmt +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | ZEEK_CUT_TIMEFMT="%H%M_%y%m%d" zeek-cut -U "%H %M %y %m %d" > env-utc-fmt # @TEST-EXEC: btest-diff env-utc-fmt diff --git a/testing/btest/zeek-aux/zeek-cut/time-fmt.test b/testing/btest/zeek-aux/zeek-cut/time-fmt.test index e12235bf4d..8c3d340fc1 100644 --- a/testing/btest/zeek-aux/zeek-cut/time-fmt.test +++ b/testing/btest/zeek-aux/zeek-cut/time-fmt.test @@ -1,26 +1,26 @@ -# Test zeek-cut with time conversion options (-D/-U). +# @TEST-DOC: Test zeek-cut with time conversion options (-D/-U). # # Test -D option. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -D "%H %M %y %m %d" > local-fmt +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -D "%H %M %y %m %d" > local-fmt # @TEST-EXEC: btest-diff local-fmt # Test -U option. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -U "%H %M %y %m %d" > utc-fmt +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -U "%H %M %y %m %d" > utc-fmt # @TEST-EXEC: btest-diff utc-fmt # Output local time (-D overrides -u). -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -u -D "%H %M %y %m %d" > utc-local-fmt +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -u -D "%H %M %y %m %d" > utc-local-fmt # @TEST-EXEC: btest-diff utc-local-fmt # Output UTC time, but with format string from -D. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -D "%H %M %y %m %d" -u > local-fmt-utc +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -D "%H %M %y %m %d" -u > local-fmt-utc # @TEST-EXEC: btest-diff local-fmt-utc # Output UTC time (-U overrides -d). -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -d -U "%H %M %y %m %d" > local-utc-fmt +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -d -U "%H %M %y %m %d" > local-utc-fmt # @TEST-EXEC: btest-diff local-utc-fmt # Output local time, but with format string from -U. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -U "%H %M %y %m %d" -d > utc-fmt-local +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -U "%H %M %y %m %d" -d > utc-fmt-local # @TEST-EXEC: btest-diff utc-fmt-local diff --git a/testing/btest/zeek-aux/zeek-cut/time-header.test b/testing/btest/zeek-aux/zeek-cut/time-header.test index d7ac7688e6..e2dfe1b9f5 100644 --- a/testing/btest/zeek-aux/zeek-cut/time-header.test +++ b/testing/btest/zeek-aux/zeek-cut/time-header.test @@ -1,30 +1,30 @@ -# Test zeek-cut with both time conversion and show header options. +# @TEST-DOC: Test zeek-cut with both time conversion and show header options. # # Time format string does not affect the header timestamps. -# @TEST-EXEC: cat $LOGS/test.log | zeek-cut -C -U "%H %M %y %m %d" > utc-fmt -# @TEST-EXEC: btest-diff utc-fmt +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/test.log | zeek-cut -C -U "%H %M %y %m %d" > utc-fmt +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff utc-fmt # Log file uses non-default field separator. -# @TEST-EXEC: cat $LOGS/conncomma.log | zeek-cut -C -d proto ts id.orig_h > nondefault-separator -# @TEST-EXEC: btest-diff nondefault-separator +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conncomma.log | zeek-cut -C -d proto ts id.orig_h > nondefault-separator +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff nondefault-separator # Field separator changes between two log files. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conncomma.log | zeek-cut -C -d proto ts id.orig_h > different-field-separator -# @TEST-EXEC: btest-diff different-field-separator +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/conncomma.log | zeek-cut -C -d proto ts id.orig_h > different-field-separator +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff different-field-separator # Column order changes between two log files. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/conntimelast.log | zeek-cut -C -d proto ts id.orig_h > 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 -d proto ts id.orig_h > different-col-order +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff different-col-order # One file has timestamps and one file does not. -# @TEST-EXEC: cat $LOGS/conn.log $LOGS/onecolumn.log | zeek-cut -C -d ts id.orig_h > missing-ts-one-file -# @TEST-EXEC: btest-diff missing-ts-one-file +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log ${ZEEK_AUX_LOGS}/onecolumn.log | zeek-cut -C -d ts id.orig_h > missing-ts-one-file +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff missing-ts-one-file # Specify ts twice. -# @TEST-EXEC: cat $LOGS/conn.log | zeek-cut -C -d ts id.orig_h ts > ts-twice -# @TEST-EXEC: btest-diff ts-twice +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/conn.log | zeek-cut -C -d ts id.orig_h ts > ts-twice +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff ts-twice # File has more than one time column. -# @TEST-EXEC: cat $LOGS/multiple-times.log | zeek-cut -C -d proto ts2 ts1 > multiple-times -# @TEST-EXEC: btest-diff multiple-times +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/multiple-times.log | zeek-cut -C -d proto ts2 ts1 > multiple-times +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff multiple-times diff --git a/testing/btest/zeek-aux/zeek-cut/time-optional.test b/testing/btest/zeek-aux/zeek-cut/time-optional.test index 4aea1b9440..d5477010e4 100644 --- a/testing/btest/zeek-aux/zeek-cut/time-optional.test +++ b/testing/btest/zeek-aux/zeek-cut/time-optional.test @@ -1,10 +1,9 @@ -# Test zeek-cut with time conversion when a time field is optional and no value -# is set. +# @TEST-DOC: Test zeek-cut with time conversion when a time field is optional and no value is set. # -# @TEST-EXEC: cat $LOGS/time-optional.log | zeek-cut -u > out 2>&1 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-time-zone btest-diff out +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/time-optional.log | zeek-cut -u > out 2>&1 +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/zeek-aux/diff-time-zone btest-diff out # File has a non-default unset field string. -# @TEST-EXEC: cat $LOGS/unset-field.log | zeek-cut -u > out2 2>&1 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-time-zone btest-diff out2 +# @TEST-EXEC: cat ${ZEEK_AUX_LOGS}/unset-field.log | zeek-cut -u > out2 2>&1 +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/zeek-aux/diff-time-zone btest-diff out2