test: only test dashboard_v2 when it is enabled #20777
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jcsp
reviewed
Mar 7, 2018
src/test/mgr/CMakeLists.txt
Outdated
| endif(WITH_MGR_DASHBOARD_V2_FRONTEND AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") | ||
| if(WITH_MGR_DASHBOARD_V2_FRONTEND) | ||
| add_ceph_test(mgr-dashboard_v2-frontend-unittests ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard_v2/run-frontend-unittests.sh) | ||
| endif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") |
There was a problem hiding this comment.
This seems like it's probably not intended: endif with a different statement than the if? Unless it's cmake trickery that I'm not familiar with.
Didn't you mean to just move the original endif to after the last add_ceph_test line?
There was a problem hiding this comment.
@jcsp Cut&paste error, will fix
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
wjwithagen
force-pushed
the
wjw-mgr_dashboard_test
branch
from
b81e2d6
to
1cfb220
Compare
|
@jcsp |
jcsp
approved these changes
Mar 12, 2018
|
@jcsp |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Willem Jan Withagen wjw@digiware.nl