ObjectCompilerTest: Replace 'optimize' setting with 'optimizationPreset'

This commit is contained in:
Kamil Śliwak
2021-04-27 14:06:56 +02:00
parent 9c6f8c011f
commit a51d72fb89
5 changed files with 19 additions and 6 deletions
+13 -2
View File
@@ -18,6 +18,8 @@
#include <test/libyul/ObjectCompilerTest.h>
#include <test/libsolidity/util/SoltestErrors.h>
#include <libsolutil/AnsiColorized.h>
#include <libyul/AssemblyStack.h>
@@ -43,7 +45,16 @@ ObjectCompilerTest::ObjectCompilerTest(string const& _filename):
TestCase(_filename)
{
m_source = m_reader.source();
m_optimize = m_reader.boolSetting("optimize", false);
m_optimisationPreset = m_reader.enumSetting<OptimisationPreset>(
"optimizationPreset",
{
{"none", OptimisationPreset::None},
{"minimal", OptimisationPreset::Minimal},
{"standard", OptimisationPreset::Standard},
{"full", OptimisationPreset::Full},
},
"minimal"
);
m_wasm = m_reader.boolSetting("wasm", false);
m_expectation = m_reader.simpleExpectations();
}
@@ -53,7 +64,7 @@ TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _li
AssemblyStack stack(
EVMVersion(),
m_wasm ? AssemblyStack::Language::Ewasm : AssemblyStack::Language::StrictAssembly,
m_optimize ? OptimiserSettings::full() : OptimiserSettings::minimal()
OptimiserSettings::preset(m_optimisationPreset)
);
if (!stack.parseAndAnalyze("source", m_source))
{