[5.0] only use --eos-vm-oc-enable option in tests when OC is available, and tweak/fix location of its usage
#1792
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
heifner
approved these changes
Oct 18, 2023
greg7mdp
reviewed
Oct 18, 2023
| @@ -227,7 +229,9 @@ BOOST_AUTO_TEST_CASE(with_8_read_only_threads) { | |||
| BOOST_AUTO_TEST_CASE(with_8_read_only_threads_no_tierup) { | |||
| std::vector<const char*> specific_args = { "-p", "eosio", "-e", | |||
| "--read-only-threads=8", | |||
| #ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED | |||
There was a problem hiding this comment.
Why not have the ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED enclose the whole BOOST_AUTO_TEST_CASE case?
There was a problem hiding this comment.
We still want this test to run on ARM without "--eos-vm-oc-enable=none"
There was a problem hiding this comment.
Wouldn't we run the same test twice then (without OC)?
linh2931
approved these changes
Oct 18, 2023
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.
--eos-vm-oc-enableoption is only available when EOS VM OC is supported. Using the option when OC is not supported results in this test getting wedged due to an unknown option being used.This fixes the test getting wedged on ARM, but maybe is not ideal since ultimately it results in the same test being run twice in such a case (since
--eos-vm-oc-enable=noneis always implied). Oh well.But while in here I noticed something else sus: there is a
with_3_read_only_threads&with_3_read_only_threads_no_tierup, and then awith_8_read_only_threads&with_8_read_only_threads_no_tierup. But--eos-vm-oc-enable=noneis passed for both "8" cases! I think the intention was--eos-vm-oc-enable=noneshould be passed for3_no_tierupand8_no_tierup, so I've tweaked it to be that way now.