fm-weck 1.4.8__py3-none-any.whl → 1.5.0__py3-none-any.whl

fm_weck/serve.py

@@ -21,7 +21,7 @@ from fm_weck.run_result import RunResult
 from fm_weck.tmp_file import NTempFile
 
 from .config import Config, parse_fm_data
-from .engine import CACHE_MOUNT_LOCATION, Engine
+from .engine import Engine
 from .file_util import copy_ensuring_unix_line_endings
 
 logger = logging.getLogger(__name__)
@@ -190,10 +190,10 @@ def run_guided(
     engine = Engine.from_config(fm_data, configuration)
 
     if log_output_to is not None:
-        engine.set_output_log(log_output_to)
+        engine.set_log_file(log_output_to)
 
     if output_files_to is not None:
-        engine.set_output_files_dir(output_files_to)
+        engine.set_output_dir(output_files_to)
     engine.print_output_to_stdout = print_tool_output_to_console
 
     current_dir = Path.cwd().resolve()
@@ -220,11 +220,9 @@ def run_guided(
 
     logger.debug("Assembled command from fm-tools: %s", command)
 
-    execution_result = engine.run(
-        f"{CACHE_MOUNT_LOCATION}/.scripts/run_with_overlay.sh", shelve_space.name, *command, timeout_sec=timeout_sec
-    )
+    engine.use_overlay(shelve_space.name)
 
-    return execution_result
+    return engine.run(*command, timeout_sec=timeout_sec)
 
 
 def run_manual(
@@ -233,6 +231,7 @@ def run_manual(
     configuration: Config,
     command: list[str],
     offline_mode: bool = False,
+    use_overlay: bool = False,
     log_output_to: Optional[Path] = None,
     output_files_to: Optional[Path] = None,
     timeout_sec: Optional[float] = None,
@@ -242,20 +241,28 @@ def run_manual(
     engine = Engine.from_config(fm_data, configuration)
 
     if log_output_to is not None:
-        engine.set_output_log(log_output_to)
+        engine.set_log_file(log_output_to)
 
     if output_files_to is not None:
-        engine.set_output_files_dir(output_files_to)
+        engine.set_output_dir(output_files_to)
 
-    executable = fm_data.get_executable_path(shelve_space)
-    logger.debug("Using executable %s", executable)
-    logger.debug("Assembled command %s", [executable, *command])
+    if use_overlay:
+        configuration.make_script_available()
+        current_dir = Path.cwd().resolve()
+        os.chdir(shelve_space)
+        executable = fm_data.get_executable_path(Path("."))
+        os.chdir(current_dir)
+
+        logger.debug("Running with overlay...")
+        engine.use_overlay(shelve_space.name)
+    else:
+        executable = fm_data.get_executable_path(shelve_space)
 
     if log_output_to is not None:
-        engine.set_output_log(log_output_to)
+        engine.set_log_file(log_output_to)
 
     if output_files_to is not None:
-        engine.set_output_files_dir(output_files_to)
+        engine.set_output_dir(output_files_to)
 
     engine.print_output_to_stdout = print_tool_output_to_console
 

fm_weck/smoke_test_mode.py

@@ -0,0 +1,82 @@
+# This file is part of fm-weck: executing fm-tools in containerized environments.
+# https://gitlab.com/sosy-lab/software/fm-weck
+#
+# SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+import subprocess
+from pathlib import Path
+
+from fm_tools.fmtoolversion import FmToolVersion
+
+from .engine import CACHE_MOUNT_LOCATION, Engine
+
+logger = logging.getLogger(__name__)
+
+
+def run_smoke_test(fm_data, shelve_space, config):
+    if not shelve_space.exists() or not shelve_space.is_dir():
+        raise ValueError(f"Invalid shelve space path: {shelve_space}")
+
+    engine = Engine.from_config(fm_data, config)
+
+    tool_dir = shelve_space.relative_to(config.cache_location)
+    engine.work_dir = CACHE_MOUNT_LOCATION / tool_dir
+
+    # Check for smoketest.sh first, then smoke_test.sh
+    if (shelve_space / "smoketest.sh").exists():
+        command = "./smoketest.sh"
+    elif (shelve_space / "smoke_test.sh").exists():
+        command = "./smoke_test.sh"
+    else:
+        raise ValueError(f"Smoke test script not found in {shelve_space}. Expected ./smoketest.sh or ./smoke_test.sh")
+
+    engine.run(command)
+
+
+def run_smoke_test_gitlab_ci(fm_data: FmToolVersion, tool_dir: Path):
+    """
+    Run smoke test in GitLab CI mode.
+    This mode directly installs required packages using apt instead of building/pulling images.
+
+    Args:
+        fm_data: The FmToolVersion object containing tool information
+        tool_dir: The directory containing the tool's smoke_test.sh script
+    """
+    # Get required packages from fm_data
+    required_packages = fm_data.get_images().required_packages
+
+    if required_packages:
+        logger.info("Installing required packages: %s", " ".join(required_packages))
+
+        # Install packages
+        try:
+            subprocess.run(["apt", "install", "-y", *required_packages], check=True)
+            logger.info("Successfully installed packages: %s", " ".join(required_packages))
+        except subprocess.CalledProcessError:
+            logger.error("Failed to install packages.")
+            raise
+    else:
+        logger.info("No required packages specified for this tool")
+
+    # Run the smoke test script
+    # Check for smoketest.sh first, then smoke_test.sh
+    smoke_test_script = tool_dir / "smoketest.sh"
+    if not smoke_test_script.exists():
+        smoke_test_script = tool_dir / "smoke_test.sh"
+
+    if not smoke_test_script.exists():
+        raise ValueError(
+            f"Smoke test script not found in downloaded tool directory: {tool_dir}. "
+            f"Expected ./smoketest.sh or ./smoke_test.sh"
+        )
+
+    logger.info("Running smoke test script: %s", smoke_test_script)
+    try:
+        subprocess.run([f"./{smoke_test_script.name}"], cwd=tool_dir, check=True)
+        logger.info("Smoke test completed successfully")
+    except subprocess.CalledProcessError as e:
+        logger.error("Smoke test failed with return code %d", e.returncode)
+        raise

{fm_weck-1.4.8.dist-info → fm_weck-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fm-weck
-Version: 1.4.8
+Version: 1.5.0
 Author-email: Henrik Wachowitz <henrik.wachowitz@ifi.lmu.de>
 Maintainer-email: Henrik Wachowitz <henrik.wachowitz@ifi.lmu.de>
 Classifier: Development Status :: 4 - Beta
@@ -16,6 +16,8 @@ Requires-Dist: pyyaml>=6.0
 Requires-Dist: tabulate
 Requires-Dist: tomli>=2.0; python_version <= '3.10'
 Requires-Dist: yaspin>=3.0
+Provides-Extra: remote
+Requires-Dist: grpcio-tools; extra == 'remote'
 Description-Content-Type: text/markdown
 
 <!--

{fm_weck-1.4.8.dist-info → fm_weck-1.5.0.dist-info}/RECORD

@@ -1,22 +1,37 @@
-fm_weck/__init__.py,sha256=hwPTOu20emETJm7zBfj7trYoLdZD-A_ZoL0mtmZcyLw,351
+fm_weck/__init__.py,sha256=v0ltYQ0MeG-hs4LVU6TIPeboGSEmIMSDHqOGvQdQR_s,351
 fm_weck/__main__.py,sha256=IfNDAqM6MK6P7KsQoW3wOHPOscB8evdVlS9C7R4wd_0,391
 fm_weck/cache_mgr.py,sha256=3-OQFmCeswazXmX08ND4oEHFOR07ZDCwWzjmFTDkOSE,1373
-fm_weck/cli.py,sha256=gWiFsbkCOWS6oXTr6srWza-qFrfpU_XR1P-MxHrCQuM,17136
+fm_weck/capture.py,sha256=iogn3JvCZEjD0SQL8Xa3TzmZAWifd9ZIP81c3JIsdUQ,982
+fm_weck/cli.py,sha256=dPpJqyF0iXqZuRiPATypDbc6TyaUWzUFpb1qc2uo-mg,23657
 fm_weck/config.py,sha256=8XXlHbb9cW1N1jatNFY5AnaRdxsSz-ohCrqq5t90RAc,8099
-fm_weck/engine.py,sha256=zway0nC4piPohK3hoBYr9Sv3xAa32dLeuPSuOw1Wers,17376
-fm_weck/exceptions.py,sha256=xXxbYK-FZW6YksBtaN79KaA4fGnFCBO-wc0QMqtq3Og,282
-fm_weck/file_util.py,sha256=R9y6LUZCDNJR4j25_Q24lN_zhACnOjYP5BvcpYaQPiA,649
-fm_weck/image_mgr.py,sha256=mDqP-YD6AEOW2xldYJ4D-wxYKF0Ta5SgoJiX2CrhyQg,1906
-fm_weck/run_result.py,sha256=0d8G3py1VCPP4jLxPCVzL8Vljvrwt9IHlmvCkW0pwx8,1249
+fm_weck/engine.py,sha256=HfRj5Okewteco7A-CccCIbk2aEGDh4K896YyQo7h1gE,21733
+fm_weck/exceptions.py,sha256=AfqTt6gxZPUQ0rKqwgdGTyfIjWmU3xBFIJxQnMLbLGo,2465
+fm_weck/file_util.py,sha256=FG_uBuNWGWbSivBv0dYzwugMkGfdS_iFY-hG6GLDD54,799
+fm_weck/image_mgr.py,sha256=lkn1nWuwKtMhtVf_PFZOOJftY5uyE0EydY2f-sefHGE,1943
+fm_weck/run_result.py,sha256=srg3w2MvC-2YqgpRtqrat2DoxhErtlc5FQO3uaFaGTI,1253
 fm_weck/runexec_mode.py,sha256=UamxVvYm0XErPjR2sRJaLMX8uHBzRcgCTWbQIZjdju0,2195
 fm_weck/runexec_util.py,sha256=YBvVIPpmEousZVxbZ5NS8jzpKPLyws31kIFE2z3Ki2E,1370
-fm_weck/serve.py,sha256=mDaZ1BUKwUh_fPgGMR4LXrJ1c5GOmwwXbHbMllmJzi8,10608
+fm_weck/serve.py,sha256=RUz_3v15By_CvcBJlNBw-mKuDubAiIha5EfayFBnqps,10728
+fm_weck/smoke_test_mode.py,sha256=SYXLf1mhdGEOS9YtJ7XuR8j_zfN9zUWhu1KSm4zgAR4,2990
 fm_weck/tmp_file.py,sha256=oJiE8VGTPxhl-bXdtbM8eNqQ4e9ECPG1jDmiboVDo_k,1956
 fm_weck/version_listing.py,sha256=caaoC3n9R-Ao2sEQ_ngOVO3bnKr7cNVeH6EiA8jO5Sc,864
+fm_weck/grpc_service/__init__.py,sha256=TvQSR0pVeh4MMMT40VfzJFyZTHpAOI7C808vjJpWiOs,390
+fm_weck/grpc_service/fm_weck_client.py,sha256=xd3ltrHcJ1fdl9V3PUFNukJahoMP_VavXTwEbPcjMyk,4862
+fm_weck/grpc_service/fm_weck_server.py,sha256=kYrhi2Egp09yMP_4-AaW5k9lGd63HTD3KekBFSsG2dk,6142
+fm_weck/grpc_service/request_handling.py,sha256=w_ZNZ1PK22D6SoBMc-hqXhy6S48kmksMXu-wSniYLSU,10912
+fm_weck/grpc_service/run_store.py,sha256=6pm_b2PCPys6qmVQvxq8qUpREdBsdOPpvOhTOfh-Rjc,864
+fm_weck/grpc_service/server_utils.py,sha256=1A3_RdjsvkeCV2w1oZemd4v9YcpcWWwgjy62jF0wUmM,721
+fm_weck/grpc_service/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fm_weck/grpc_service/proto/fm_weck_service.proto,sha256=HcRpwWnNTxHEGxitZZb_RcXTQX97erySKItGCg0AhBw,3316
+fm_weck/grpc_service/proto/fm_weck_service_pb2.py,sha256=O8qtEYv77kGKaBbo-AXGTxYJTSTo6rBHN03PIZJB3cA,5647
+fm_weck/grpc_service/proto/fm_weck_service_pb2.pyi,sha256=JH44EhTejp9Nk1dlnPuen2ZVp0WeAnbSvrT6FL9ihJg,6391
+fm_weck/grpc_service/proto/fm_weck_service_pb2_grpc.py,sha256=YCnAPNEGQUNqgVzGB_JeV01fxsiiC7VlP0Aos-n5gWE,12076
+fm_weck/grpc_service/proto/generate_protocol_files.sh,sha256=F9dd95qKejtB7B3P-x9d2oAr9VrW9AZRMfm8KKRKLpk,801
 fm_weck/resources/BenchExec-3.27-py3-none-any.whl,sha256=g-db8LM8HfqLhbnl7n5lvUbMnF2tZ4MHAVOxTGxqO8w,732849
 fm_weck/resources/BenchExec-3.27-py3-none-any.whl.license,sha256=Nq2Mwgn_pyr6ZZrTT095QPtFP3hr15ZeIRIaY0B7eC8,201
-fm_weck/resources/Containerfile,sha256=MltxP1of9klsQFNR8WyngRTJrPwxQTF4C9ennRxVqSo,391
-fm_weck/resources/__init__.py,sha256=-YLqFTF2Gu4RA9ye3SdvBk1rjhlYxk_f1TgPsix3SAk,1213
+fm_weck/resources/Containerfile,sha256=HpPkrzJe1IKsmLOfbe5LbT-suaV6eJn1fT4csSvEkOk,390
+fm_weck/resources/__init__.py,sha256=Gd3SNYBUUgDCJFMVwaaPynmugTUKoWamBXRhbasRKJE,1522
+fm_weck/resources/c_program_example.c,sha256=WOTAn4XyQL8TlplI6M8FbKiUxiwnvHUy2o6n0hLIe6o,21862
 fm_weck/resources/run_with_overlay.sh,sha256=v1gV_6kMQ0v9BQ3chgDqI1MAOLHbPWeeTC52aCqVpEM,1162
 fm_weck/resources/runexec,sha256=ogIBO38HLu9C9kDTTANBgAqVnH-UIF1bSJ9d3DSjyF4,462
 fm_weck/resources/properties/coverage-branches.prp,sha256=Gl2r1cgBFoh4M2laa8dVGhteHkL04oiBRLzxz_hbkEU,56
@@ -150,7 +165,7 @@ fm_weck/resources/fm_tools/wit4java.yml,sha256=ylfze2XbV4zKkVUH57Veqn7G49gW0Byxd
 fm_weck/resources/fm_tools/witch.yml,sha256=wwe6lrI2sxGKVZbLeipa38rPhB2pcSUFi9uVngtXGUQ,1795
 fm_weck/resources/fm_tools/witnesslint.yml,sha256=EvMBcm5fx6lgSLRmHSKXSxXIJKZ-BrxLwTXI4GQ6FMs,6812
 fm_weck/resources/fm_tools/witnessmap.yml,sha256=FyZtEloxpWBBjLn9kyqoen2kPjOkH2r4fxAj5gfV8Bg,1692
-fm_weck-1.4.8.dist-info/METADATA,sha256=gGPe1x8nywUCLB85Ldg2MTFg4j7gMU8LRPFarOjIQKo,3269
-fm_weck-1.4.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fm_weck-1.4.8.dist-info/entry_points.txt,sha256=toWpKCSY1u593MPnI_xW5gnwlnkerP4AvmPQ1s2nPgY,50
-fm_weck-1.4.8.dist-info/RECORD,,
+fm_weck-1.5.0.dist-info/METADATA,sha256=UqR47gDzSfO-MS7U0lEmpMoYJ5Xe6Vx_4cxMXg7qq-0,3339
+fm_weck-1.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fm_weck-1.5.0.dist-info/entry_points.txt,sha256=toWpKCSY1u593MPnI_xW5gnwlnkerP4AvmPQ1s2nPgY,50
+fm_weck-1.5.0.dist-info/RECORD,,