Skip to content
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.

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

ccmlib/common: check for scylla built with CMake as well #552

Merged
merged 2 commits into from
Jan 17, 2024

Conversation

tchaikov
Copy link
Contributor

cmake generates scylla at paths like build/Debug/scylla instead of
build/debug/scylla, so check for them as well.

restructure isScylla() by extracting the scylla modes into a list,
to prepare for the changes for working with CMake generated scylla
executable, which is located under paths like build/Debug/scylla
instead of build/debug/scylla.

Signed-off-by: Kefu Chai <[email protected]>
cmake generates scylla at paths like `build/Debug/scylla` instead of
`build/debug/scylla`, so check for them as well.

Signed-off-by: Kefu Chai <[email protected]>
@tchaikov tchaikov requested a review from denesb January 16, 2024 05:37
Copy link
Contributor

@fruch fruch left a comment

Choose a reason for hiding this comment

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

LGTM

I'm guessing in some part in dtest itself would need adapting

@tchaikov
Copy link
Contributor Author

LGTM

I'm guessing in some part in dtest itself would need adapting

yes, i am working on that end also.

@tchaikov
Copy link
Contributor Author

@scylladb/qa-maintainers hello maintainers, could you help merge this change?

Copy link
Contributor

@soyacz soyacz left a comment

Choose a reason for hiding this comment

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

LGTM

@fruch fruch merged commit 50cfb26 into scylladb:next Jan 17, 2024
4 checks passed
@tchaikov tchaikov deleted the cmake-is-scylla branch January 17, 2024 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants