test: move gcc_compile

Move gcc_compile so it doesn't have to be imported from a conftest.py
file.

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

tests/conftest.py

@@ -105,7 +105,6 @@ def test_with_any_microvm(test_microvm_any):
     SUPPORTED_CPU_TEMPLATES,
     SUPPORTED_CUSTOM_CPU_TEMPLATES,
 )
-from framework.with_filelock import with_filelock
 from host_tools.ip_generator import network_config, subnet_generator
 from host_tools.metrics import get_metrics_logger
 
@@ -255,15 +254,6 @@ def test_fc_session_root_path():
     shutil.rmtree(fc_session_root_path)
 
 
-@with_filelock
-def _gcc_compile(src_file, output_file, extra_flags="-static -O3"):
-    """Build a source file with gcc."""
-    output_file = Path(output_file)
-    if not output_file.exists():
-        compile_cmd = f"gcc {src_file} -o {output_file} {extra_flags}"
-        utils.run_cmd(compile_cmd)
-
-
 @pytest.fixture(scope="session")
 def bin_cloner_path(test_fc_session_root_path):
     """Build a binary that `clone`s into the jailer.
@@ -272,15 +262,15 @@ def bin_cloner_path(test_fc_session_root_path):
     syscall directly.
     """
     cloner_bin_path = os.path.join(test_fc_session_root_path, "newpid_cloner")
-    _gcc_compile("host_tools/newpid_cloner.c", cloner_bin_path)
+    build_tools.gcc_compile("host_tools/newpid_cloner.c", cloner_bin_path)
     yield cloner_bin_path
 
 
 @pytest.fixture(scope="session")
 def bin_vsock_path(test_fc_session_root_path):
     """Build a simple vsock client/server application."""
     vsock_helper_bin_path = os.path.join(test_fc_session_root_path, "vsock_helper")
-    _gcc_compile("host_tools/vsock_helper.c", vsock_helper_bin_path)
+    build_tools.gcc_compile("host_tools/vsock_helper.c", vsock_helper_bin_path)
     yield vsock_helper_bin_path
 
 
@@ -290,7 +280,7 @@ def change_net_config_space_bin(test_fc_session_root_path):
     change_net_config_space_bin = os.path.join(
         test_fc_session_root_path, "change_net_config_space"
     )
-    _gcc_compile(
+    build_tools.gcc_compile(
         "host_tools/change_net_config_space.c",
         change_net_config_space_bin,
         extra_flags="-static",

tests/host_tools/cargo_build.py

@@ -145,3 +145,12 @@ def run_rebase_snap_bin(base_snap, diff_snap):
     )
 
     assert rc == 0
+
+
+@with_filelock
+def gcc_compile(src_file, output_file, extra_flags="-static -O3"):
+    """Build a source file with gcc."""
+    output_file = Path(output_file)
+    if not output_file.exists():
+        compile_cmd = f"gcc {src_file} -o {output_file} {extra_flags}"
+        utils.run_cmd(compile_cmd)

tools/create_snapshot_artifact/main.py

@@ -17,7 +17,6 @@
 # The test infra assumes it is running from the `tests` directory.
 os.chdir("tests")
 from conftest import ARTIFACTS_COLLECTION as ARTIFACTS
-from conftest import _gcc_compile
 from framework.artifacts import create_net_devices_configuration
 from framework.builder import MicrovmBuilder, SnapshotBuilder, SnapshotType
 from framework.defs import DEFAULT_TEST_SESSION_ROOT_PATH
@@ -28,6 +27,7 @@
     run_cmd,
 )
 from framework.utils_cpuid import CpuVendor, get_cpu_vendor
+from host_tools.cargo_build import gcc_compile
 from integration_tests.functional.test_cmd_line_start import _configure_vm_from_json
 
 # restore directory
@@ -59,8 +59,7 @@ def compile_file(file_name, dest_path, bin_name):
 
     source_file_path = os.path.join(host_tools_path, file_name)
     bin_file_path = os.path.join(dest_path, bin_name)
-    _gcc_compile(source_file_path, bin_file_path)
-
+    gcc_compile(source_file_path, bin_file_path)
     return bin_file_path