Merge remote-tracking branch 'origin/topic/seth/small-builtin-plugin-fixes'

* origin/topic/seth/small-builtin-plugin-fixes:
  Fix tests
  Removed a non-functional builtin plugin preload loading mechanism
  Load the builtin-plugin preload files and fix the dev path.
This commit is contained in:
Tim Wojtulewicz 2021-06-30 14:10:58 -07:00
commit 3c0bb8f1dd
8 changed files with 16 additions and 11 deletions

View file

@ -534,6 +534,7 @@ SetupResult setup(int argc, char** argv, Options* zopts)
if ( ! options.bare_mode )
add_input_file("base/init-default.zeek");
add_input_file("builtin-plugins/__preload__.zeek");
add_input_file("builtin-plugins/__load__.zeek");
plugin_mgr->SearchDynamicPlugins(util::zeek_plugin_path());