Merge pull request #15666 from ipsilon/eof-enable-eof-testing

eof: Enable compilation to EOF for all `EVMVersionRestrictedTestCase` tests by default
ethereum · Feb 3, 2025 · eb3b721 · eb3b721
2 parents afaed2b + 0555618
commit eb3b721
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
@@ -150,7 +150,7 @@ void EVMVersionRestrictedTestCase::processBytecodeFormatSetting()
 	// EOF only available since Prague
 	solAssert(!eofVersion.has_value() ||solidity::test::CommonOptions::get().evmVersion() >= langutil::EVMVersion::prague());
 
-	std::string bytecodeFormatString = m_reader.stringSetting("bytecodeFormat", "legacy");
+	std::string bytecodeFormatString = m_reader.stringSetting("bytecodeFormat", "legacy,>=EOFv1");
 	if (bytecodeFormatString == "legacy,>=EOFv1" || bytecodeFormatString == ">=EOFv1,legacy")
 		return;
 

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
@@ -91,7 +91,12 @@ SemanticTest::SemanticTest(
 	if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1)
 		m_shouldRun = false;
 
-	std::string compileViaYul = m_reader.stringSetting("compileViaYul", "also");
+	auto const eofEnabled = solidity::test::CommonOptions::get().eofVersion().has_value();
+	std::string compileViaYul = m_reader.stringSetting("compileViaYul", eofEnabled ? "true" : "also");
+
+	if (compileViaYul == "false" && eofEnabled)
+		m_shouldRun = false;
+
 	if (m_runWithABIEncoderV1Only && compileViaYul != "false")
 		BOOST_THROW_EXCEPTION(std::runtime_error(
 			"ABIEncoderV1Only tests cannot be run via yul, "

diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
@@ -53,6 +53,10 @@ SyntaxTest::SyntaxTest(
 	m_compileViaYul = m_reader.stringSetting("compileViaYul", eofEnabled ? "true" : "false");
 	if (!util::contains(compileViaYulAllowedValues, m_compileViaYul))
 		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid compileViaYul value: " + m_compileViaYul + "."));
+
+	if (m_compileViaYul == "false" && eofEnabled)
+		m_shouldRun = false;
+
 	m_optimiseYul = m_reader.boolSetting("optimize-yul", true);
 
 	static std::map<std::string, PipelineStage> const pipelineStages = {