From 3ef7e0711b69eaacda55a73edd70f097b05cfd45 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Fri, 10 Oct 2025 12:49:33 +0000 Subject: [PATCH] Revert "functional2: fix in the development shell" This reverts commit 42691f0d943b43842e69b76608cbe4416e35e94e. Reason for revert: darwin builds time out now, apparently due to newly appearing infinite loops in the test suite Change-Id: I81a09efd53636a287f3095ac87ed8854b6e57922 --- tests/functional2/meson.build | 4 +--- tests/functional2/testlib/global_assets/config.nix.template | 2 +- tests/functional2/testlib/utils.py | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/functional2/meson.build b/tests/functional2/meson.build index 4e2b116ca..2b606274d 100644 --- a/tests/functional2/meson.build +++ b/tests/functional2/meson.build @@ -15,9 +15,7 @@ functional2_env = environment() # set the bin dir for us to know where to find the lix binaries for our declarative path # without leaking all of PATH or env functional2_env.set('NIX_BIN_DIR', bindir) -if build_test_shell != '' - functional2_env.set('BUILD_TEST_SHELL', build_test_shell) -endif +functional2_env.set('BUILD_TEST_SHELL', build_test_shell) functional2_env.set('system', host_system) test( diff --git a/tests/functional2/testlib/global_assets/config.nix.template b/tests/functional2/testlib/global_assets/config.nix.template index ad68f5507..bb6b331f2 100644 --- a/tests/functional2/testlib/global_assets/config.nix.template +++ b/tests/functional2/testlib/global_assets/config.nix.template @@ -17,7 +17,7 @@ rec { mkDerivation = args: derivation ({ inherit system; - builder = "@shell@"; + builder = "/bin/sh"; args = ["-e" args.builder or (builtins.toFile "builder-${args.name}.sh" '' if [ -e "$NIX_ATTRS_SH_FILE" ]; then source $NIX_ATTRS_SH_FILE; fi; eval "$buildCommand" diff --git a/tests/functional2/testlib/utils.py b/tests/functional2/testlib/utils.py index c486b7729..07343c60a 100644 --- a/tests/functional2/testlib/utils.py +++ b/tests/functional2/testlib/utils.py @@ -144,7 +144,6 @@ def get_global_asset(name: str) -> Fileish: "system": os.environ.get("system"), # noqa: SIM112 # system is actually lowercase here # Either just the build shell or entire global path if we are darwin "path": os.environ.get("BUILD_TEST_SHELL") or os.environ.get("PATH"), - "shell": Path(os.environ.get("BUILD_TEST_SHELL") or "/bin") / "sh", }, ) return CopyFile(functional2_base_folder / "testlib" / "global_assets" / name)