This repository was archived by the owner on Jul 8, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 34
Add debian buster (for 9.3-backports branch) #597
Merged
Merged
Conversation
This file contains hidden or 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
We currently have run scripts for each supported debian version. These run scripts are mostly very similiar. So it makes sense to use a common script. The differences are if we use COVERALLS support which we can support via environment variables. We also reduce the number of jobs in preparation for adding debian 10 (buster) support. We only keep the debug jobs of debian 9 and lower.
This differs from the debian 9 docker file in the fact that we need python2 as well for one of the test scripts.
The variable FAILED is never defined, therefore the if condition was never met. We now check for the existence of the generated file which and then output the result of the command.
…go_host file The PROJECT_BINARY_DIR points to CMAKE_BINARY_DIR/cpp_test_suite but we want to have CMAKE_BINARY_DIR/ccp_test_suite/environment. Let's use no path as configure_file defaults to CMAKE_CURRENT_BINARY_DIR anyway and we use later calls in the same way. This issue was found with CMAKE 3.13.4 from debian buster.
The post test script ensures that all device servers are properly shutdown. This sometimes fails on travis with debian buster. As this is not a relevant part of the test anyway we can just return with zero exit code.
bourtemb
reviewed
Oct 22, 2019
76601f4 to
8712591
Compare
Collaborator
Author
|
PR is currently blocked until #598 is merged. After that this PR needs these changes as well. |
We don't have the old problems with the void* conversion anymore. Now we want to explain to the user in detail how to install cppzmq for the cppTango repository and when installed via the tango source distribution.
In 86174ee (Travis Tests: Avoid code duplication, 2019-06-05) we added support for using the environment variable NON_STOCK_CPPZMQ to say if we use the stock version or the non-stock version. That commit got the logic wrong. Flip the naming to have now one less negation. STOCK_CPPZMQ=ON means that the system cppzmq is used, =OFF that we use the latest cppzmq from the repo.
Since 9c02de3 (- Commit after merge with NextRelease branch at release 22135, 2013-02-22) we check the libzmq version to decide if cppzmq's socket class has a disconnect method or not. This currently fails on debian wheezy. As that is also the wrong approach in general, we now use a compilation test in the cmake setup phase to determine if we have the disconnect method or not. This is only done on non-Windows platforms, on Windows we assume that we have a disconnect method (we currently always compile against a cppzmq version which has it). In addition the define got also renamed from ZMQ_HAS_DISCONNECT to TANGO_ZMQ_HAS_DISCONNECT to make it clear that this is our define.
8712591 to
3389e02
Compare
Collaborator
Author
|
Integrated #598. |
bourtemb
approved these changes
Oct 28, 2019
Member
bourtemb
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me!
Thanks!
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.