From 521f54c4f0f7770e120bcbd9841efa8ed84328f6 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 11 Aug 2011 11:34:42 -0500 Subject: [PATCH] Fix check_for_unused_event_handlers option. The format string given to the reporter warning call wasn't printing the handler names. Also changed it so that each warning message has the full context of the warning. --- src/main.cc | 3 +-- .../Baseline/core.check-unused-event-handlers/.stderr | 1 + testing/btest/core/check-unused-event-handlers.test | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 testing/btest/Baseline/core.check-unused-event-handlers/.stderr create mode 100644 testing/btest/core/check-unused-event-handlers.test diff --git a/src/main.cc b/src/main.cc index f1b393310b..c2d61e7c60 100644 --- a/src/main.cc +++ b/src/main.cc @@ -931,9 +931,8 @@ int main(int argc, char** argv) if ( dead_handlers->length() > 0 && check_for_unused_event_handlers ) { - reporter->Warning("event handlers never invoked:"); for ( int i = 0; i < dead_handlers->length(); ++i ) - reporter->Warning("\t", (*dead_handlers)[i]); + reporter->Warning("event handler never invoked: %s", (*dead_handlers)[i]); } delete dead_handlers; diff --git a/testing/btest/Baseline/core.check-unused-event-handlers/.stderr b/testing/btest/Baseline/core.check-unused-event-handlers/.stderr new file mode 100644 index 0000000000..8d8bf1a85b --- /dev/null +++ b/testing/btest/Baseline/core.check-unused-event-handlers/.stderr @@ -0,0 +1 @@ +warning in , line 1: event handler never invoked: this_is_never_used diff --git a/testing/btest/core/check-unused-event-handlers.test b/testing/btest/core/check-unused-event-handlers.test new file mode 100644 index 0000000000..f9ad105ff6 --- /dev/null +++ b/testing/btest/core/check-unused-event-handlers.test @@ -0,0 +1,8 @@ +# This test should print a warning that the event handler is never invoked. +# @TEST-EXEC: bro -b %INPUT check_for_unused_event_handlers=T +# @TEST-EXEC: btest-diff .stderr + +event this_is_never_used() + { + print "not even once"; + }