fm-weck 1.5.2__py3-none-any.whl → 1.6.0__py3-none-any.whl

fm_weck/resources/fm_tools/verioover.yml

@@ -11,7 +11,8 @@ fmtools_entry_maintainers:
   - hobooe
 
 maintainers:
-  - name: HaiPeng Qu
+  - orcid: 0000-0000-0000-0000
+    name: HaiPeng Qu
     institution: Ocean University of China
     country: China
     url:
@@ -20,11 +21,23 @@ versions:
   - version: "svcomp23"
     doi: 10.5281/zenodo.10407457
     benchexec_toolinfo_options: []
+    base_container_images:
+      - docker.io/ubuntu:22.04
     required_ubuntu_packages: []
     full_container_images:
       - registry.gitlab.com/sosy-lab/benchmarking/competition-scripts/user:2023
 
 competition_participations:
+  - competition: "SV-COMP 2026"
+    track: "Verification"
+    label:
+      - inactive
+    tool_version: "svcomp23"
+    jury_member:
+      name: Hors Concours
+      institution: --
+      country: --
+      url:
   - competition: "SV-COMP 2025"
     track: "Verification"
     label:
@@ -57,3 +70,5 @@ competition_participations:
 techniques: []
 
 frameworks_solvers: []
+
+literature: []

fm_weck/resources/fm_tools/wasp-c.yml

@@ -11,7 +11,8 @@ fmtools_entry_maintainers:
   - filipeom
 
 maintainers:
-  - name: Filipe Marques
+  - orcid: 0000-0000-0000-0000
+    name: Filipe Marques
     institution: INESC-ID, Lisbon
     country: Portugal
     url: https://filipeom.github.io/
@@ -20,6 +21,8 @@ versions:
   - version: "testcomp23"
     doi: 10.5281/zenodo.10412766
     benchexec_toolinfo_options: ['--smt-assume', '--policy', 'breadth', '--test-comp']
+    base_container_images:
+      - docker.io/ubuntu:22.04
     required_ubuntu_packages:
       - gcc
       - make
@@ -29,6 +32,16 @@ versions:
       - registry.gitlab.com/sosy-lab/benchmarking/competition-scripts/user:2024
 
 competition_participations:
+  - competition: "Test-Comp 2026"
+    track: "Test Generation"
+    label:
+      - inactive
+    tool_version: "testcomp23"
+    jury_member:
+      name: Hors Concours
+      institution: --
+      country: --
+      url:
   - competition: "Test-Comp 2025"
     track: "Test Generation"
     label:
@@ -64,3 +77,5 @@ techniques:
   - Symbolic Execution
 
 frameworks_solvers: []
+
+literature: []

fm_weck/resources/fm_tools/wit4java.yml

@@ -1,5 +1,7 @@
 id: wit4java
 name: Wit4Java
+description: |
+  Wit4java is a violation witness validator for java verifiers.
 input_languages:
   - Java
 project_url: https://github.com/Anthonysdu/wit4java
@@ -18,21 +20,50 @@ maintainers:
     url:
 
 versions:
+  - version: "svcomp26"
+    doi: 10.5281/zenodo.18001116
+    benchexec_toolinfo_options: ["--witness", "${witness}", "--local-dir"]
+    base_container_images:
+      - docker.io/ubuntu:24.04
+    required_ubuntu_packages:
+      - openjdk-8-jdk-headless
+      - python3-setuptools
+    full_container_images:
+      - registry.gitlab.com/sosy-lab/benchmarking/competition-scripts/10.5281/zenodo.18001433
+      - registry.gitlab.com/sosy-lab/benchmarking/competition-scripts/user:2026-wit4java
+
   - version: "svcomp25"
     doi: 10.5281/zenodo.14261105
     benchexec_toolinfo_options: ["--witness", "${witness}", "--local-dir"]
+    base_container_images:
+      - docker.io/ubuntu:24.04
     required_ubuntu_packages: []
+
   - version: "svcomp23"
     doi: 10.5281/zenodo.10206747
     benchexec_toolinfo_options: []
+    base_container_images:
+      - docker.io/ubuntu:22.04
     required_ubuntu_packages:
       - python3-networkx
     full_container_images:
       - registry.gitlab.com/sosy-lab/benchmarking/competition-scripts/user:2024
 
 competition_participations:
+  - competition: "SV-COMP 2026"
+    track: "Validation of Violation Witnesses v1"
+    tool_version: "svcomp26"
+    jury_member:
+      orcid: 0000-0002-0986-4150
+      name: Tong Wu
+      institution: University of Manchester
+      country: UK
+      url:
+    participants:
+      - orcid: 0000-0002-0986-4150
+        name: Tong Wu
   - competition: "SV-COMP 2025"
-    track: "Validation of Violation Witnesses 1.0"
+    track: "Validation of Violation Witnesses v1"
     tool_version: "svcomp25"
     jury_member:
       orcid: 0000-0002-0986-4150
@@ -41,7 +72,7 @@ competition_participations:
       country: UK
       url:
   - competition: "SV-COMP 2024"
-    track: "Validation of Violation Witnesses 1.0"
+    track: "Validation of Violation Witnesses v1"
     label:
       - inactive
     tool_version: "svcomp23"
@@ -51,7 +82,7 @@ competition_participations:
       country: --
       url:
   - competition: "SV-COMP 2023"
-    track: "Validation of Violation Witnesses 1.0"
+    track: "Validation of Violation Witnesses v1"
     tool_version: "svcomp23"
     jury_member:
       orcid: 0000-0002-0986-4150
@@ -60,7 +91,8 @@ competition_participations:
       country: UK
       url:
 
-techniques: []
+techniques:
+  - Targeted Input Generation
 
 frameworks_solvers: []
 

fm_weck/resources/fm_tools/witch.yml

@@ -6,8 +6,8 @@ description: |
 name: Witch
 input_languages:
   - C
-project_url: https://github.com/ayazip/witch-klee
-repository_url: https://github.com/ayazip/witch-klee
+project_url: https://github.com/ayazip/witch
+repository_url: https://github.com/ayazip/witch
 spdx_license_identifier: "MIT"
 benchexec_toolinfo_module: "symbiotic-witch.py"
 fmtools_format_version: "2.0"
@@ -22,12 +22,23 @@ maintainers:
     url:
 
 versions:
+  - version: "svcomp26"
+    benchexec_toolinfo_options: ['--sv-comp', '--witness-check', "${witness}"]
+    required_ubuntu_packages:
+      - python3
+      - python3-yaml
+      - llvm-14
+    doi: "10.5281/zenodo.17697224"
+    base_container_images:
+      - docker.io/ubuntu:24.04
   - version: "svcomp25"
     benchexec_toolinfo_options: ['--sv-comp', '--witness-check', "${witness}"]
     required_ubuntu_packages:
       - python3
       - llvm-14
     doi: "10.5281/zenodo.14207188"
+    base_container_images:
+      - docker.io/ubuntu:24.04
   - version: "svcomp24"
     benchexec_toolinfo_options: ['--sv-comp']
     required_ubuntu_packages:
@@ -35,8 +46,22 @@ versions:
     doi: "10.5281/zenodo.10064512"
 
 competition_participations:
+  - competition: "SV-COMP 2026"
+    track: "Validation of Violation Witnesses v2"
+    tool_version: "svcomp26"
+    jury_member:
+      orcid: 0000-0003-1072-8137
+      name: Paulína Ayaziová
+      institution: Masaryk University, Brno
+      country: Czechia
+      url:
+    participants:
+      - orcid: 0000-0003-1072-8137
+        name: Paulína Ayaziová
+      - orcid: 0000-0001-5873-403X
+        name: Jan Strejček
   - competition: "SV-COMP 2025"
-    track: "Validation of Violation Witnesses 2.0"
+    track: "Validation of Violation Witnesses v2"
     tool_version: "svcomp25"
     jury_member:
       orcid: 0000-0003-1072-8137
@@ -45,7 +70,7 @@ competition_participations:
       country: Czechia
       url:
   - competition: "SV-COMP 2024"
-    track: "Validation of Violation Witnesses 2.0"
+    track: "Validation of Violation Witnesses v2"
     tool_version: "svcomp24"
     jury_member:
       orcid: 0000-0003-1072-8137

fm_weck/resources/fm_tools/witnesslint.yml

@@ -33,6 +33,43 @@ maintainers:
     url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
 
 versions:
+  - version: "2.1.2-correctness-witnesses-v2"
+    doi: 10.5281/zenodo.17792484
+    benchexec_toolinfo_options: ["--witness", "${witness}", "--expectCorrectnessWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "2"]
+    required_ubuntu_packages:
+      - python3-lxml
+      - python3-jsonschema
+      - python3-yaml
+      - python3-pycparser
+      - python3-clang
+  - version: "2.1.2-violation-witnesses-v2"
+    doi: 10.5281/zenodo.17792484
+    benchexec_toolinfo_options: ["--witness", "${witness}", "--expectViolationWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "2"]
+    required_ubuntu_packages:
+      - python3-lxml
+      - python3-jsonschema
+      - python3-yaml
+      - python3-pycparser
+      - python3-clang
+  - version: "2.1.2-correctness-witnesses-v1"
+    doi: 10.5281/zenodo.17792484
+    benchexec_toolinfo_options: ["--witness", "${witness}", "--expectCorrectnessWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "1"]
+    required_ubuntu_packages:
+      - python3-lxml
+      - python3-jsonschema
+      - python3-yaml
+      - python3-pycparser
+      - python3-clang
+  - version: "2.1.2-violation-witnesses-v1"
+    doi: 10.5281/zenodo.17792484
+    benchexec_toolinfo_options: ["--witness", "${witness}", "--expectViolationWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "1"]
+    required_ubuntu_packages:
+      - python3-lxml
+      - python3-jsonschema
+      - python3-yaml
+      - python3-pycparser
+      - python3-clang
+
   - version: "svcomp25-correctness-graphml"
     doi: 10.5281/zenodo.15050742
     benchexec_toolinfo_options: ["--witness", "${witness}", "--expectCorrectnessWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "1.0"]
@@ -41,6 +78,8 @@ versions:
       - python3-jsonschema
       - python3-yaml
       - python3-pycparser
+    base_container_images:
+      - docker.io/ubuntu:24.04
   - version: "svcomp25-violation-graphml"
     doi: 10.5281/zenodo.15050742
     benchexec_toolinfo_options: ["--witness", "${witness}", "--expectViolationWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "1.0"]
@@ -49,6 +88,8 @@ versions:
       - python3-jsonschema
       - python3-yaml
       - python3-pycparser
+    base_container_images:
+      - docker.io/ubuntu:24.04
   - version: "svcomp25-correctness-yaml"
     doi: 10.5281/zenodo.15050742
     benchexec_toolinfo_options: ["--witness", "${witness}", "--expectCorrectnessWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "2.0"]
@@ -57,6 +98,8 @@ versions:
       - python3-jsonschema
       - python3-yaml
       - python3-pycparser
+    base_container_images:
+      - docker.io/ubuntu:24.04
   - version: "svcomp25-violation-yaml"
     doi: 10.5281/zenodo.15050742
     benchexec_toolinfo_options: ["--witness", "${witness}", "--expectViolationWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "2.0"]
@@ -65,6 +108,9 @@ versions:
       - python3-jsonschema
       - python3-yaml
       - python3-pycparser
+    base_container_images:
+      - docker.io/ubuntu:24.04
+
   - version: "svcomp24-correctness-graphml"
     doi: 10.5281/zenodo.10213801
     benchexec_toolinfo_options: ["--expectCorrectnessWitness", "--ignoreSelfLoops", "--expectedWitnessVersion", "1.0"]
@@ -99,8 +145,65 @@ versions:
       - python3-pycparser
 
 competition_participations:
+  - competition: "SV-COMP 2026"
+    track: "Validation of Correctness Witnesses v2"
+    label:
+      - auxiliary
+    tool_version: "2.1.2-correctness-witnesses-v2"
+    jury_member:
+      orcid: 0000-0002-8172-3184
+      name: Marian Lingsch-Rosenfeld
+      institution: LMU Munich
+      country: Germany
+      url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
+    participants:
+      - orcid: 0000-0002-8172-3184
+        name: Marian Lingsch-Rosenfeld
+  - competition: "SV-COMP 2026"
+    track: "Validation of Correctness Witnesses v1"
+    label:
+      - auxiliary
+    tool_version: "2.1.2-correctness-witnesses-v1"
+    jury_member:
+      orcid: 0000-0002-8172-3184
+      name: Marian Lingsch-Rosenfeld
+      institution: LMU Munich
+      country: Germany
+      url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
+    participants:
+      - orcid: 0000-0002-8172-3184
+        name: Marian Lingsch-Rosenfeld
+  - competition: "SV-COMP 2026"
+    track: "Validation of Violation Witnesses v2"
+    label:
+      - auxiliary
+    tool_version: "2.1.2-violation-witnesses-v2"
+    jury_member:
+      orcid: 0000-0002-8172-3184
+      name: Marian Lingsch-Rosenfeld
+      institution: LMU Munich
+      country: Germany
+      url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
+    participants:
+      - orcid: 0000-0002-8172-3184
+        name: Marian Lingsch-Rosenfeld
+  - competition: "SV-COMP 2026"
+    track: "Validation of Violation Witnesses v1"
+    label:
+      - auxiliary
+    tool_version: "2.1.2-violation-witnesses-v1"
+    jury_member:
+      orcid: 0000-0002-8172-3184
+      name: Marian Lingsch-Rosenfeld
+      institution: LMU Munich
+      country: Germany
+      url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
+    participants:
+      - orcid: 0000-0002-8172-3184
+        name: Marian Lingsch-Rosenfeld
+
   - competition: "SV-COMP 2025"
-    track: "Validation of Correctness Witnesses 1.0"
+    track: "Validation of Correctness Witnesses v1"
     label:
       - auxiliary
     tool_version: "svcomp25-correctness-graphml"
@@ -111,7 +214,7 @@ competition_participations:
       country: Germany
       url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
   - competition: "SV-COMP 2025"
-    track: "Validation of Correctness Witnesses 2.0"
+    track: "Validation of Correctness Witnesses v2"
     label:
       - auxiliary
     tool_version: "svcomp25-correctness-yaml"
@@ -122,7 +225,7 @@ competition_participations:
       country: Germany
       url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
   - competition: "SV-COMP 2025"
-    track: "Validation of Violation Witnesses 1.0"
+    track: "Validation of Violation Witnesses v1"
     label:
       - auxiliary
     tool_version: "svcomp25-violation-graphml"
@@ -133,7 +236,7 @@ competition_participations:
       country: Germany
       url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
   - competition: "SV-COMP 2025"
-    track: "Validation of Violation Witnesses 2.0"
+    track: "Validation of Violation Witnesses v2"
     label:
       - auxiliary
     tool_version: "svcomp25-violation-yaml"
@@ -144,7 +247,7 @@ competition_participations:
       country: Germany
       url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
   - competition: "SV-COMP 2024"
-    track: "Validation of Correctness Witnesses 1.0"
+    track: "Validation of Correctness Witnesses v1"
     label:
       - auxiliary
     tool_version: "svcomp24-correctness-graphml"
@@ -155,7 +258,7 @@ competition_participations:
       country: Germany
       url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
   - competition: "SV-COMP 2024"
-    track: "Validation of Correctness Witnesses 2.0"
+    track: "Validation of Correctness Witnesses v2"
     label:
       - auxiliary
     tool_version: "svcomp24-correctness-yaml"
@@ -166,7 +269,7 @@ competition_participations:
       country: Germany
       url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
   - competition: "SV-COMP 2024"
-    track: "Validation of Violation Witnesses 1.0"
+    track: "Validation of Violation Witnesses v1"
     label:
       - auxiliary
     tool_version: "svcomp24-violation-graphml"
@@ -177,7 +280,7 @@ competition_participations:
       country: Germany
       url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
   - competition: "SV-COMP 2024"
-    track: "Validation of Violation Witnesses 2.0"
+    track: "Validation of Violation Witnesses v2"
     label:
       - auxiliary
     tool_version: "svcomp24-violation-yaml"

fm_weck/resources/fm_tools/witnessmap.yml

@@ -33,13 +33,41 @@ maintainers:
     url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
 
 versions:
+  - version: "0.0.2"
+    doi: 10.5281/zenodo.17769876
+    benchexec_toolinfo_options: []
+    required_ubuntu_packages:
+      - python3-yaml
+    base_container_images:
+      - docker.io/ubuntu:24.04
+    full_container_images:
+      - registry.gitlab.com/sosy-lab/benchmarking/competition-scripts/user:2026
   - version: "svcomp25"
     doi: 10.5281/zenodo.14205153
     benchexec_toolinfo_options: []
     required_ubuntu_packages:
       - python3-yaml
-
+    base_container_images:
+      - docker.io/ubuntu:24.04
+    full_container_images:
+      - registry.gitlab.com/sosy-lab/benchmarking/competition-scripts/user:2026
 competition_participations:
+  - competition: "SV-COMP 2026"
+    track: "Verification"
+    label:
+      - auxiliary
+    tool_version: "0.0.2"
+    jury_member:
+      orcid: 0000-0002-8172-3184
+      name: Marian Lingsch-Rosenfeld
+      institution: LMU Munich
+      country: Germany
+      url: https://www.sosy-lab.org/people/lingsch-rosenfeld/
+    participants:
+      - orcid: 0000-0003-4832-7662
+        name: Dirk Beyer
+      - orcid: 0000-0002-8172-3184
+        name: Marian Lingsch-Rosenfeld
   - competition: "SV-COMP 2025"
     track: "Verification"
     label:

fm_weck/run_result.py

@@ -6,12 +6,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import dataclass
-from functools import singledispatchmethod
+from typing import TYPE_CHECKING
 
-from benchexec.tools.template import BaseTool2
-from benchexec.util import ProcessExitCode
-from fm_tools.fmtoolversion import FmToolVersion
-from fm_tools.run import get_tool_info
+if TYPE_CHECKING:
+    from benchexec.tools.template import BaseTool2
+    from fm_tools.fmtoolversion import FmToolVersion
 
 
 @dataclass(frozen=True)
@@ -21,6 +20,9 @@ class RunResult:
     raw_output: str
 
     def as_benchexec_run(self):
+        from benchexec.tools.template import BaseTool2
+        from benchexec.util import ProcessExitCode
+
         return BaseTool2.Run(
             cmdline=self.command,
             exit_code=ProcessExitCode.create(value=self.exit_code),
@@ -28,11 +30,13 @@ class RunResult:
             termination_reason=False,  # TODO: We do not know about this
         )
 
-    @singledispatchmethod
-    def determine_result(self, tool: BaseTool2) -> str:
-        return tool.determine_result(self.as_benchexec_run())
+    def determine_result(self, tool: "BaseTool2 | FmToolVersion") -> str:
+        from benchexec.tools.template import BaseTool2
+
+        if isinstance(tool, BaseTool2):
+            return tool.determine_result(self.as_benchexec_run())
+
+        from fm_tools.run import get_tool_info
 
-    @determine_result.register
-    def _(self, tool: FmToolVersion) -> str:
         tool_ = get_tool_info(tool)
-        return self.determine_result(tool_)
+        return tool_.determine_result(self.as_benchexec_run())

fm_weck/runexec_mode.py

@@ -7,11 +7,13 @@
 
 import importlib.resources as pkg_resources
 import logging
+import os
 import shutil
 from pathlib import Path
+from tempfile import NamedTemporaryFile
 from typing import TYPE_CHECKING, Optional
 
-from fm_weck.resources import BENCHEXEC_WHL
+from fm_weck.resources import BENCHEXEC_WHL, RUNEXEC_SCRIPT
 from fm_weck.runexec_util import mountable_absolute_paths_of_command
 
 from .config import Config
@@ -20,16 +22,38 @@ from .engine import CACHE_MOUNT_LOCATION, Engine
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
+    from tempfile import _TemporaryFileWrapper
+
     from fm_weck.run_result import RunResult
 
 
+def _setup_script_in_cache(target: "_TemporaryFileWrapper[bytes]") -> Path:
+    # When running multiple instances in parallel it can happen, that two processes interfere
+    # when copying the script causing a "Text file is busy" error.
+    # Using a temp file avoids this problem.
+    # The cleaner solution would be to use a direct bind mount from the package resource, but this does not
+    # work on the benchcloud right now.
+
+    with pkg_resources.path("fm_weck.resources", RUNEXEC_SCRIPT) as source_path:
+        shutil.copy(source_path, target.name)
+
+    target_path = Path(target.name)
+    mode = target_path.stat().st_mode
+    # make the temp file executable
+    target_path.chmod(mode | os.X_OK)
+    target.flush()
+    target.close()
+
+    return target_path
+
+
 def run_runexec(
     benchexec_package: Optional[Path],
     use_image: Optional[str],
     configuration: Config,
     extra_container_args: list[list[str]],
     command: list[str],
-) -> "RunResult":
+) -> "RunResult| None":
     if use_image is not None:
         configuration.set_default_image(use_image)
 
@@ -38,7 +62,7 @@ def run_runexec(
     engine.add_mounting_capabilities = False
 
     if benchexec_package is not None:
-        engine.mount(benchexec_package.parent.absolute(), "/home/__fm_weck_benchexec")
+        engine.mount(str(benchexec_package.parent.absolute()), "/home/__fm_weck_benchexec")
         engine.env["PYTHONPATH"] = f"/home/__fm_weck_benchexec/{benchexec_package.name}"
     else:
         # Default to the bundled benchexec package
@@ -52,13 +76,19 @@ def run_runexec(
             return None
 
     for path in mountable_absolute_paths_of_command(Path.cwd().absolute(), command):
-        engine.mount(path, str(path) + ":ro")
+        engine.mount(str(path), str(path) + ":ro")
 
     for arg in extra_container_args:
         engine.add_container_long_opt(arg)
 
-    configuration.make_runexec_script_available()
-
     engine.handle_io = False
 
-    return engine.run(f"{CACHE_MOUNT_LOCATION}/.scripts/runexec", *command)
+    with (
+        NamedTemporaryFile(
+            prefix="runexec_", dir=str(configuration.cache_location / ".scripts"), delete=True, delete_on_close=False
+        ) as tmp_file,
+    ):
+        script_path = _setup_script_in_cache(tmp_file)
+
+        rel_path = script_path.relative_to(configuration.cache_location)
+        return engine.run(f"{CACHE_MOUNT_LOCATION}/{rel_path}", *command)

fm_weck/smoke_test_mode.py

@@ -48,7 +48,7 @@ class SmokeTestFileIsNotExecutableError(SmokeTestError):
 
 
 def locate_and_check_smoke_test_file(shelve_space: Path) -> str:
-    """Check if the smoke test file exists and is not empty.
+    """Check if the smoke test file exists, is executable, and is not empty.
 
     Args:
         shelve_space: Path to the shelve space directory.
@@ -59,15 +59,11 @@ def locate_and_check_smoke_test_file(shelve_space: Path) -> str:
     Raises:
         NoSmokeTestFileError: If the smoke test file does not exist.
         SmokeTestFileIsEmptyError: If the smoke test file is empty.
+        SmokeTestFileIsNotExecutableError: If the smoke test file is not executable.
     """
-    if not (shelve_space / "smoketest.sh").exists() and not (shelve_space / "smoke_test.sh").exists():
-        raise NoSmokeTestFileError(f"Smoke test file not found in: {shelve_space}")
-
-    if (shelve_space / "smoketest.sh").exists():
-        file_path = shelve_space / "smoketest.sh"
-    else:
-        # Since we checked for existence above, this must exist
-        file_path = shelve_space / "smoke_test.sh"
+    file_path = shelve_space / "smoketest.sh"
+    if not file_path.exists():
+        raise NoSmokeTestFileError(f"Smoke test file 'smoketest.sh' not found in: {shelve_space}")
 
     if not file_path.stat().st_mode & os.X_OK:
         raise SmokeTestFileIsNotExecutableError(file_path.relative_to(shelve_space))
@@ -100,7 +96,7 @@ def run_smoke_test_gitlab_ci(fm_data: FmToolVersion, tool_dir: Path):
 
     Args:
         fm_data: The FmToolVersion object containing tool information
-        tool_dir: The directory containing the tool's smoke_test.sh script
+        tool_dir: The directory containing the tool's smoketest.sh script
     """
     # Get required packages from fm_data
     required_packages = fm_data.get_images().required_packages