From 1f27edf756af5d0bb6ccd38f171914247c48124c Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Fri, 11 Mar 2022 14:48:18 -0800 Subject: [PATCH] btest tweaks I overlooked --- testing/btest/Baseline/language.init-integration/.stderr | 1 + .../Baseline/language.redef-same-prefixtable-idx/.stderr | 4 ++-- testing/btest/language/redef-same-prefixtable-idx.zeek | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 testing/btest/Baseline/language.init-integration/.stderr diff --git a/testing/btest/Baseline/language.init-integration/.stderr b/testing/btest/Baseline/language.init-integration/.stderr new file mode 100644 index 0000000000..49d861c74c --- /dev/null +++ b/testing/btest/Baseline/language.init-integration/.stderr @@ -0,0 +1 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline/language.redef-same-prefixtable-idx/.stderr b/testing/btest/Baseline/language.redef-same-prefixtable-idx/.stderr index ebf136334a..2bf6110ff6 100644 --- a/testing/btest/Baseline/language.redef-same-prefixtable-idx/.stderr +++ b/testing/btest/Baseline/language.redef-same-prefixtable-idx/.stderr @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -warning in /Users/vern/warehouse/zeek/master/testing/btest/.tmp/language.redef-same-prefixtable-idx/redef-same-prefixtable-idx.zeek, line 7: initialization not preceded by =/+=/-= is deprecated (3.0.0.0/8 = 1.0.0.0/8) -warning in /Users/vern/warehouse/zeek/master/testing/btest/.tmp/language.redef-same-prefixtable-idx/redef-same-prefixtable-idx.zeek, line 8: initialization not preceded by =/+=/-= is deprecated (3.0.0.0/8 = 2.0.0.0/8) +warning in <...>/redef-same-prefixtable-idx.zeek, line 7: initialization not preceded by =<...>/-= is deprecated (3.0.0.0/8 = 1.0.0.0/8) +warning in <...>/redef-same-prefixtable-idx.zeek, line 8: initialization not preceded by =<...>/-= is deprecated (3.0.0.0/8 = 2.0.0.0/8) diff --git a/testing/btest/language/redef-same-prefixtable-idx.zeek b/testing/btest/language/redef-same-prefixtable-idx.zeek index 74d0feb82c..838f3fc0ba 100644 --- a/testing/btest/language/redef-same-prefixtable-idx.zeek +++ b/testing/btest/language/redef-same-prefixtable-idx.zeek @@ -1,5 +1,5 @@ # @TEST-EXEC: zeek -b %INPUT >out -# @TEST-EXEC: btest-diff .stderr +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr # @TEST-EXEC: btest-diff out const my_table: table[subnet] of subnet &redef;