Skip to content

Do not tweak test targets from Spicy #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbannier merged 1 commit into from
May 27, 2025
Merged

Do not tweak test targets from Spicy #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ConfigureSpicyBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ set(_spicy_targets
hilti-rt-objects
hiltic
jrx-objects
retest
Copy link
Contributor

@awelzel awelzel May 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fly-by food-for-thought: Would we have a good place in the zeek repos to place this? Meaning the whole file.

Copy link
Contributor

@awelzel awelzel May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using this in the for loop below could work as well in case Zeek would ever set SPICY_ENABLE_TESTS to on, but might hide problems as well (?)

if ( TARGET ... )

Copy link
Member Author

@bbannier bbannier May 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All this file does is tweak the build of Spicy targets when it is built as part of Zeek, so there is zero potential for reuse. I'd just put this on top of the line doing add_subdirectory(auxil/spicy) in zeek/zeek 🤷.

Even when building with Spicy tests this should still work. One could see more errors, but the build would finish (unless building with -Werror, but okay). I don't think we need to accommodate for that scenario here.

Copy link
Member Author

@bbannier bbannier May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated, if the intention for this repo was "CMake functionality reusable across the ecosystem", it has accumulated a lot of stuff which should just be in zeek/zeek.

Copy link
Contributor

@awelzel awelzel May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd just put this on top of the line doing add_subdirectory(auxil/spicy) in zeek/zeek

👍

Unrelated, if the intention for this repo was "CMake functionality reusable across the ecosystem", it has accumulated a lot of stuff which should just be in zeek/zeek.

Yeah, that's the angle I was looking at this change right now, too.

spicy-batch-extract
spicy-config
spicy-driver
spicy-objects
spicy-rt-debug-objects
spicy-rt-objects
spicyc
testregex
spicy-doc
spicy-dump)

Expand Down
Loading