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

Take into account multi-line license comments when adding preamble in test frameworks

Browse Source
This commit is contained in:
Kamil Śliwak 2023-08-04 18:48:15 +02:00
parent 69e5b634ea
commit 0c2fce579a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/libsolidity/AnalysisFramework.cpp
View File

@ -52,7 +52,7 @@ AnalysisFramework::parseAnalyseAndReturnError(
{ {
compiler().reset(); compiler().reset();
// Do not insert license if it is already present. // Do not insert license if it is already present.
bool insertLicense = _insertLicenseAndVersionPragma && _source.find("// SPDX-License-Identifier:") == string::npos; bool insertLicense = _insertLicenseAndVersionPragma && _source.find("SPDX-License-Identifier:") == string::npos;
compiler().setSources({{"", compiler().setSources({{"",
string{_insertLicenseAndVersionPragma ? "pragma solidity >=0.0;\n" : ""} + string{_insertLicenseAndVersionPragma ? "pragma solidity >=0.0;\n" : ""} +
string{insertLicense ? "// SPDX-License-Identifier: GPL-3.0\n" : ""} + string{insertLicense ? "// SPDX-License-Identifier: GPL-3.0\n" : ""} +

2
test/libsolidity/SolidityExecutionFramework.cpp
View File

@ -146,7 +146,7 @@ string SolidityExecutionFramework::addPreamble(string const& _sourceCode)
{ {
// Silence compiler version warning // Silence compiler version warning
string preamble = "pragma solidity >=0.0;\n"; string preamble = "pragma solidity >=0.0;\n";
if (_sourceCode.find("// SPDX-License-Identifier:") == string::npos) if (_sourceCode.find("SPDX-License-Identifier:") == string::npos)
preamble += "// SPDX-License-Identifier: unlicensed\n"; preamble += "// SPDX-License-Identifier: unlicensed\n";
if ( if (
solidity::test::CommonOptions::get().useABIEncoderV1 && solidity::test::CommonOptions::get().useABIEncoderV1 &&