Cleanup the SystemC tests and get macOS CI passing again #558
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
If CXX is not set in the environment, use "c++" and not "g++". And include CXXFLAGS on the command line, if set. BSC also looks for BSC_CXXFLAGS, but we don't replicate that in the testsuite.
In the tests for BSC's capability to generate SystemC wrappers, some old tests were manually setting BSC's flags to specify SystemC. Update them to use procedures in the testsuite infrastructure, that abstarct the details in one place (where it will be easier to make changes to the flags, if needed).
And use it to get the SystemC tests passing on macOS, now that the SystemC library installed by Homebrew requires a flag to the C++ compiler. Also, cleanup how the SystemC flags are received in the testsuite. The testsuite has "which_*" procedures for getting the location of executables and "get_*" procedures for getting other values -- the SYSTEMC_INC and SYSTEMC_LIB variables were incorrectly using "which_*". The testsuite requires that these be set (if SystemC tests are enabled) and they can be expected to exist as variables, so there's no need for "get_*" functions for them; instead the functionality is bundled into a single function that is called at the start and that installs the values into global values -- in the same way that "get_test_options" does for "vtest" etc (and the SystemC options could eventually be bundled in with that). The SystemC test procedures can also assume that the values exist, so conditional code to check for that is removed.
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.
This fixes #557. It cleans up the test suite infrastructure around SystemC tests and adds a new option TEST_SYSTEMC_CXXFLAGS, which allows the macOS CI to pass
-std=c++11to those tests. It also adds documentation to the test suite README about this new option and a few others that weren't mentioned.