@@ -71,7 +71,7 @@ SemanticTest::SemanticTest(
71
71
if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get ().useABIEncoderV1 )
72
72
m_shouldRun = false ;
73
73
74
- string compileViaYul = m_reader.stringSetting (" compileViaYul" , " default " );
74
+ string compileViaYul = m_reader.stringSetting (" compileViaYul" , " also " );
75
75
if (m_runWithABIEncoderV1Only && compileViaYul != " false" )
76
76
BOOST_THROW_EXCEPTION (runtime_error (
77
77
" ABIEncoderV1Only tests cannot be run via yul, "
@@ -345,7 +345,6 @@ TestCase::TestResult SemanticTest::runTest(
345
345
m_compileToEwasm = _isEwasmRun;
346
346
}
347
347
348
- m_canEnableYulRun = false ;
349
348
m_canEnableEwasmRun = false ;
350
349
351
350
if (_isYulRun)
@@ -465,18 +464,6 @@ TestCase::TestResult SemanticTest::runTest(
465
464
success &= test.call ().expectedSideEffects == test.call ().actualSideEffects ;
466
465
}
467
466
468
- if (!m_testCaseWantsYulRun && _isYulRun)
469
- {
470
- m_canEnableYulRun = success;
471
- string message = success ?
472
- " Test can pass via Yul, but marked with \" compileViaYul: false.\" " :
473
- " Test compiles via Yul, but it gives different test results." ;
474
- AnsiColorized (_stream, _formatted, {BOLD, success ? YELLOW : MAGENTA}) <<
475
- _linePrefix << endl <<
476
- _linePrefix << message << endl;
477
- return TestResult::Failure;
478
- }
479
-
480
467
// Right now we have sometimes different test results in Yul vs. Ewasm.
481
468
// The main reason is that Ewasm just returns a failure in some cases.
482
469
// TODO: If Ewasm support got fully implemented, we could implement this in the same way as above.
@@ -654,25 +641,19 @@ void SemanticTest::printUpdatedExpectations(ostream& _stream, string const&) con
654
641
void SemanticTest::printUpdatedSettings (ostream& _stream, string const & _linePrefix)
655
642
{
656
643
auto & settings = m_reader.settings ();
657
- if (settings.empty () && !m_canEnableYulRun )
644
+ if (settings.empty () && !m_canEnableEwasmRun )
658
645
return ;
659
646
660
647
_stream << _linePrefix << " // ====" << endl;
661
648
if (m_canEnableEwasmRun)
662
649
{
663
- soltestAssert (m_canEnableYulRun || m_testCaseWantsYulRun, " " );
664
- string compileViaYul = m_reader.stringSetting (" compileViaYul" , " " );
665
- if (!compileViaYul.empty ())
666
- _stream << _linePrefix << " // compileViaYul: " << compileViaYul << " \n " ;
650
+ soltestAssert (m_testCaseWantsYulRun, " " );
667
651
_stream << _linePrefix << " // compileToEwasm: also\n " ;
668
652
}
669
- else if (m_canEnableYulRun)
670
- _stream << _linePrefix << " // compileViaYul: also\n " ;
671
653
672
654
for (auto const & [settingName, settingValue]: settings)
673
655
if (
674
- !(settingName == " compileToEwasm" && m_canEnableEwasmRun) &&
675
- !(settingName == " compileViaYul" && (m_canEnableYulRun || m_canEnableEwasmRun))
656
+ !(settingName == " compileToEwasm" && m_canEnableEwasmRun)
676
657
)
677
658
_stream << _linePrefix << " // " << settingName << " : " << settingValue<< endl;
678
659
}
0 commit comments