Merge pull request #15803 from ipsilon/filter-object-compiler-test-ouputs

Add `outputs` setting to `ObjectCompilerTest`

Author: cameel

test/libyul/ObjectCompilerTest.cpp

@@ -57,6 +57,13 @@ ObjectCompilerTest::ObjectCompilerTest(std::string const& _filename):
 		},
 		"minimal"
 	);
+
+	constexpr std::array allowedOutputs = {"Assembly", "Bytecode", "Opcodes", "SourceMappings"};
+	boost::split(m_outputSetting, m_reader.stringSetting("outputs", "Assembly,Bytecode,Opcodes,SourceMappings"), boost::is_any_of(","));
+	for (auto const& output: m_outputSetting)
+		if (std::find(allowedOutputs.begin(), allowedOutputs.end(), output) == allowedOutputs.end())
+			BOOST_THROW_EXCEPTION(std::runtime_error{"Invalid output type: \"" + output + "\""});
+
 	m_expectation = m_reader.simpleExpectations();
 }
 
@@ -78,18 +85,26 @@ TestCase::TestResult ObjectCompilerTest::run(std::ostream& _stream, std::string
 	solAssert(obj.bytecode);
 	solAssert(obj.sourceMappings);
 
-	m_obtainedResult = "Assembly:\n" + obj.assembly->assemblyString(yulStack.debugInfoSelection());
+	if (std::find(m_outputSetting.begin(), m_outputSetting.end(), "Assembly") != m_outputSetting.end())
+		m_obtainedResult = "Assembly:\n" + obj.assembly->assemblyString(yulStack.debugInfoSelection());
 	if (obj.bytecode->bytecode.empty())
 		m_obtainedResult += "-- empty bytecode --\n";
 	else
-		m_obtainedResult +=
-			"Bytecode: " +
-			util::toHex(obj.bytecode->bytecode) +
-			"\nOpcodes: " +
-			boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode, solidity::test::CommonOptions::get().evmVersion())) +
-			"\nSourceMappings:" +
-			(obj.sourceMappings->empty() ? "" : " " + *obj.sourceMappings) +
-			"\n";
+	{
+		if (std::find(m_outputSetting.begin(), m_outputSetting.end(), "Bytecode") != m_outputSetting.end())
+			m_obtainedResult += "Bytecode: " + util::toHex(obj.bytecode->bytecode);
+		if (std::find(m_outputSetting.begin(), m_outputSetting.end(), "Opcodes") != m_outputSetting.end())
+		{
+			m_obtainedResult += (!m_obtainedResult.empty() && m_obtainedResult.back() != '\n') ? "\n" : "";
+			m_obtainedResult += "Opcodes: " +
+				boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode, solidity::test::CommonOptions::get().evmVersion()));
+		}
+		if (std::find(m_outputSetting.begin(), m_outputSetting.end(), "SourceMappings") != m_outputSetting.end())
+		{
+			m_obtainedResult += (!m_obtainedResult.empty() && m_obtainedResult.back() != '\n') ? "\n" : "";
+			m_obtainedResult += "SourceMappings:" + (obj.sourceMappings->empty() ? "" : " " + *obj.sourceMappings) + "\n";
+		}
+	}
 
 	return checkResult(_stream, _linePrefix, _formatted);
 }

test/libyul/ObjectCompilerTest.h

@@ -54,6 +54,7 @@ class ObjectCompilerTest: public solidity::frontend::test::EVMVersionRestrictedT
 	void disambiguate();
 
 	frontend::OptimisationPreset m_optimisationPreset;
+	std::vector<std::string> m_outputSetting;
 };
 
 }