cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isoltest: Do not return an error code from --help

Browse Source
This commit is contained in:
Kamil Śliwak 2021-11-15 18:19:37 +01:00
parent 7bace8d25d
commit cf6704ae06
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/Common.h
View File

@ -75,6 +75,9 @@ struct CommonOptions
langutil::EVMVersion evmVersion() const; langutil::EVMVersion evmVersion() const;
virtual void addOptions(); virtual void addOptions();
// @returns true if the program should continue, false if it should exit immediately without
// reporting an error.
// Throws ConfigException or std::runtime_error if parsing fails.
virtual bool parse(int argc, char const* const* argv); virtual bool parse(int argc, char const* const* argv);
// Throws a ConfigException on error // Throws a ConfigException on error
virtual void validate() const; virtual void validate() const;

6
test/tools/IsolTestOptions.cpp
View File

@ -75,9 +75,9 @@ void IsolTestOptions::addOptions()
bool IsolTestOptions::parse(int _argc, char const* const* _argv) bool IsolTestOptions::parse(int _argc, char const* const* _argv)
{ {
bool const res = CommonOptions::parse(_argc, _argv); bool const shouldContinue = CommonOptions::parse(_argc, _argv);
if (showHelp || !res) if (showHelp || !shouldContinue)
{ {
std::cout << options << std::endl; std::cout << options << std::endl;
return false; return false;
@ -85,7 +85,7 @@ bool IsolTestOptions::parse(int _argc, char const* const* _argv)
enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{} && !useABIEncoderV1); enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{} && !useABIEncoderV1);
return res; return shouldContinue;
} }
void IsolTestOptions::validate() const void IsolTestOptions::validate() const

5
test/tools/isoltest.cpp
View File

@ -433,8 +433,9 @@ int main(int argc, char const *argv[])
{ {
auto options = std::make_unique<IsolTestOptions>(); auto options = std::make_unique<IsolTestOptions>();
if (!options->parse(argc, argv)) bool shouldContinue = options->parse(argc, argv);
return -1; if (!shouldContinue)
return 0;
options->validate(); options->validate();
CommonOptions::setSingleton(std::move(options)); CommonOptions::setSingleton(std::move(options));