fixes

Author: felix314159

src/pytest_plugins/solc/solc.py

@@ -68,9 +68,7 @@ def pytest_configure(config: pytest.Config):
             # solc-select current does not support ARM linux
             if platform.system().lower() == "linux" and platform.machine().lower() == "aarch64":
                 error_message = f"Version {version} does not match solc_version {solc_version}\
- and since solc-select currently does not support ARM linux you must manually do the following: \
-Build solc from source, and manually move the binary to\
- .venv/.solc-select/artifacts/solc-x.y.z/solc-x.y.z, then run 'uv run solc-select use <x.y.z>'."
+ and since solc-select currently does not support ARM linux we can not recover from this problem."
                 pytest.exit(error_message, returncode=pytest.ExitCode.USAGE_ERROR)
 
             if config.getoption("verbose") > 0:
@@ -101,17 +99,24 @@ def pytest_configure(config: pytest.Config):
     config.solc_version = solc_version_semver  # type: ignore
 
     # test whether solc_version matches actual one
-    solc_version_check_result = subprocess.run(
+    # using subprocess because that's how yul is compiled in
+    # ./src/ethereum_test_specs/static_state/common/compile_yul.py
+    expected_solc_version_string: str = str(solc_version_semver)
+    actual_solc_version = subprocess.run(
         ["solc", "--version"],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
         text=True,
         check=True,
     )
-    solc_version_check_result_string = solc_version_check_result.stdout
-    if str(solc_version_semver) not in solc_version_check_result_string:
+    actual_solc_version_string = actual_solc_version.stdout
+    # use only look at first 10 chars to pass e.g.
+    # actual: 0.8.25+commit.b61c2a91.Linux.g++ should pass with expected: "0.8.25+commit.b61c2a91
+    if (
+        expected_solc_version_string[:10] not in actual_solc_version_string
+    ) or expected_solc_version_string == "":
         error_message = f"Expected solc version {solc_version_semver} but detected a\
- different solc version:\n{solc_version_check_result_string}\nCritical error, aborting.."
+ different solc version:\n{actual_solc_version_string}\nCritical error, aborting.."
         pytest.exit(error_message, returncode=pytest.ExitCode.USAGE_ERROR)