From bf320465ae7951b78387481f68fb0b72b3ad785e Mon Sep 17 00:00:00 2001
From: Farid Zakaria <farid.m.zakaria@gmail.com>
Date: Thu, 24 Jul 2025 20:42:40 -0700
Subject: [PATCH] Make functional tests depend on nix binary so they auto
 recompile

With this I'm able to do a fresh config + meson test with all dependencies
correctly propagated.

Co-authored-by: Sergei Zimmerman <sergei@zimmerman.foo>
---
 src/nix/meson.build          |  4 +++-
 src/perl/lib/Nix/meson.build |  3 ++-
 src/perl/meson.build         |  2 +-
 src/perl/t/meson.build       |  4 ++--
 tests/functional/meson.build | 14 +++++++++++++-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/nix/meson.build b/src/nix/meson.build
index c6dc9c530..e17b39f98 100644
--- a/src/nix/meson.build
+++ b/src/nix/meson.build
@@ -211,6 +211,7 @@ if host_machine.system() == 'windows'
   executable_suffix = '.exe'
 endif
 
+nix_symlinks_targets = []
 foreach linkname : nix_symlinks
   install_symlink(
     linkname + executable_suffix,
@@ -220,7 +221,7 @@ foreach linkname : nix_symlinks
     # The 'runtime' tag is what executables default to, which we want to emulate here.
     install_tag : 'runtime',
   )
-  custom_target(
+  symlink_target = custom_target(
     command : [ 'ln', '-sf', fs.name(this_exe), '@OUTPUT@' ],
     output : linkname + executable_suffix,
     # native doesn't allow dangling symlinks, but the target executable often doesn't exist at this time
@@ -230,6 +231,7 @@ foreach linkname : nix_symlinks
   )
   # TODO(Ericson3214): Doesn't yet work
   #meson.override_find_program(linkname, t)
+  nix_symlinks_targets += symlink_target
 endforeach
 
 install_symlink(
diff --git a/src/perl/lib/Nix/meson.build b/src/perl/lib/Nix/meson.build
index 5f8baee69..dd5560e21 100644
--- a/src/perl/lib/Nix/meson.build
+++ b/src/perl/lib/Nix/meson.build
@@ -16,8 +16,9 @@ nix_perl_scripts = files(
   'Utils.pm',
 )
 
+nix_perl_scripts_copy_tgts = []
 foreach f : nix_perl_scripts
-  fs.copyfile(f)
+  nix_perl_scripts_copy_tgts += fs.copyfile(f)
 endforeach
 
 
diff --git a/src/perl/meson.build b/src/perl/meson.build
index f33291051..59f2a66b8 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -191,6 +191,6 @@ if get_option('tests').enabled()
     yath,
     args : [ 'test' ],
     workdir : meson.current_build_dir(),
-    depends : [ nix_perl_store_lib ],
+    depends : [ nix_perl_store_lib ] + nix_perl_tests_copy_tgts + nix_perl_scripts_copy_tgts,
   )
 endif
diff --git a/src/perl/t/meson.build b/src/perl/t/meson.build
index dbd1139f3..f95bee2ff 100644
--- a/src/perl/t/meson.build
+++ b/src/perl/t/meson.build
@@ -9,7 +9,7 @@ nix_perl_tests = files(
   'init.t',
 )
 
-
+nix_perl_tests_copy_tgts = []
 foreach f : nix_perl_tests
-  fs.copyfile(f)
+  nix_perl_tests_copy_tgts += fs.copyfile(f)
 endforeach
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 85373a70a..e501aa102 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -223,6 +223,18 @@ subdir('local-overlay-store')
 foreach suite : suites
   workdir = suite['workdir']
   suite_name = suite['name']
+  # This is workaround until [1] is resolved. When building in a devshell
+  # as a subproject we want the tests to depend on the nix build target, so
+  # that it gets automatically rebuilt.
+  # However, when the functional test suite is built separately (via componentized
+  # builds or in NixOS tests) we can't depend on the nix executable, since it's
+  # an external program. The following is a simple heuristic that suffices for now.
+  # [1]: https://github.com/mesonbuild/meson/issues/13877
+  deps = suite['deps']
+  if meson.is_subproject()
+    nix_subproject = subproject('nix')
+    deps += [ nix ] + nix_subproject.get_variable('nix_symlinks_targets')
+  endif
   foreach script : suite['tests']
     # Turns, e.g., `tests/functional/flakes/show.sh` into a Meson test target called
     # `functional-flakes-show`.
@@ -252,7 +264,7 @@ foreach suite : suites
       # them more time than the default of 30 seconds.
       timeout : 300,
       # Used for target dependency/ordering tracking, not adding compiler flags or anything.
-      depends : suite['deps'],
+      depends : deps,
       workdir : workdir,
     )
   endforeach