From 4d6a1cf4a9535b9f41cc2826f6d9134b1879699d Mon Sep 17 00:00:00 2001 From: Emma Harper Smith Date: Wed, 4 Jun 2025 11:45:54 -0700 Subject: [PATCH 1/3] Take two at fixing WASI config.site usage --- master/custom/factories.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/master/custom/factories.py b/master/custom/factories.py index a45f23b1..00b860a1 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -893,7 +893,9 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs): warnOnFailure=True, ) ) - self.host_configure_cmd.append(util.Interpolate("CONFIG_SITE=%(prop:config_site)s")) + self.compile_environ.update( + CONFIG_SITE=util.Interpolate("%(prop:config_site)s") + ) self.addStep( ShellCommand( name="Touch srcdir Modules/Setup.local", From 7ea0286d18e28977c3a4ab9884dc4151d187172a Mon Sep 17 00:00:00 2001 From: Emma Smith Date: Wed, 4 Jun 2025 12:03:06 -0700 Subject: [PATCH 2/3] Copy environment from parent Co-authored-by: Zachary Ware --- master/custom/factories.py | 1 + 1 file changed, 1 insertion(+) diff --git a/master/custom/factories.py b/master/custom/factories.py index 00b860a1..66acf528 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -893,6 +893,7 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs): warnOnFailure=True, ) ) + self.compile_environ = super().compile_environ.copy() self.compile_environ.update( CONFIG_SITE=util.Interpolate("%(prop:config_site)s") ) From 4275ef1459cc35675141bdae23c97e3a0f838282 Mon Sep 17 00:00:00 2001 From: Emma Smith Date: Wed, 4 Jun 2025 12:05:19 -0700 Subject: [PATCH 3/3] Use relative path to config_site variable Co-authored-by: Zachary Ware --- master/custom/factories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master/custom/factories.py b/master/custom/factories.py index 66acf528..b26bb643 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -895,7 +895,7 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs): ) self.compile_environ = super().compile_environ.copy() self.compile_environ.update( - CONFIG_SITE=util.Interpolate("%(prop:config_site)s") + CONFIG_SITE=util.Interpolate("../../%(prop:config_site)s") ) self.addStep( ShellCommand(