From d260a5b7a913ec37c507f36ae4dbd994fd707f30 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 19 Nov 2024 12:11:39 -0800 Subject: [PATCH] Remove unneeded @loads from base/misc/version.zeek This module is loaded by the telemetry framework, which we're now loading via the cluster framework, i.e. also in bare mode. The resulting additional thread (for creating reporter.log) trips up a number of btest baselines. version.zeek doesn't use any of the string helper functions. --- scripts/base/misc/version.zeek | 3 --- testing/btest/Baseline/scripts.base.misc.version/.stderr | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/base/misc/version.zeek b/scripts/base/misc/version.zeek index 14e3d4c2a7..36d8ab1fc3 100644 --- a/scripts/base/misc/version.zeek +++ b/scripts/base/misc/version.zeek @@ -2,9 +2,6 @@ ##! The most convenient way to access this are the Version::number ##! and Version::info constants. -@load base/frameworks/reporter -@load base/utils/strings - module Version; export { diff --git a/testing/btest/Baseline/scripts.base.misc.version/.stderr b/testing/btest/Baseline/scripts.base.misc.version/.stderr index 4cd9e25cb2..c7e80a0f4c 100644 --- a/testing/btest/Baseline/scripts.base.misc.version/.stderr +++ b/testing/btest/Baseline/scripts.base.misc.version/.stderr @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/version.zeek, line 63: Version string 1 cannot be parsed -error in <...>/version.zeek, line 63: Version string 1.12-beta-drunk-too-much cannot be parsed -error in <...>/version.zeek, line 63: Version string JustARandomString cannot be parsed +error in <...>/version.zeek, line 60: Version string 1 cannot be parsed +error in <...>/version.zeek, line 60: Version string 1.12-beta-drunk-too-much cannot be parsed +error in <...>/version.zeek, line 60: Version string JustARandomString cannot be parsed