From 340fa00d5243beb0d2c69596e6e890970e5a03ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 7 Apr 2025 17:09:42 +0200
Subject: [PATCH 1/2] Fix/run monitorfdhup test

---
 src/libutil-tests/meson.build     | 1 +
 src/libutil-tests/monitorfdhup.cc | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libutil-tests/meson.build b/src/libutil-tests/meson.build
index 8f9c18eed..f2552550d 100644
--- a/src/libutil-tests/meson.build
+++ b/src/libutil-tests/meson.build
@@ -59,6 +59,7 @@ sources = files(
   'json-utils.cc',
   'logging.cc',
   'lru-cache.cc',
+  'monitorfdhup.cc',
   'nix_api_util.cc',
   'pool.cc',
   'position.cc',
diff --git a/src/libutil-tests/monitorfdhup.cc b/src/libutil-tests/monitorfdhup.cc
index 01ecb92d9..f9da4022d 100644
--- a/src/libutil-tests/monitorfdhup.cc
+++ b/src/libutil-tests/monitorfdhup.cc
@@ -1,5 +1,5 @@
-#include "util.hh"
-#include "monitor-fd.hh"
+#include "nix/util/util.hh"
+#include "nix/util/monitor-fd.hh"
 
 #include <sys/file.h>
 #include <gtest/gtest.h>

From 611fd806cbcee3a0c9ae89df5d26a24769e75ed0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 7 Apr 2025 17:10:28 +0200
Subject: [PATCH 2/2] Remove unused tracing-file-system-object-sink.{hh,cc}

---
 .../tests/tracing-file-system-object-sink.hh  | 41 -------------------
 .../tracing-file-system-object-sink.cc        | 34 ---------------
 2 files changed, 75 deletions(-)
 delete mode 100644 src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh
 delete mode 100644 src/libutil-test-support/tracing-file-system-object-sink.cc

diff --git a/src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh b/src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh
deleted file mode 100644
index d721c13af..000000000
--- a/src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-#include "nix/util/fs-sink.hh"
-
-namespace nix::test {
-
-/**
- * A `FileSystemObjectSink` that traces calls, writing to stderr.
- */
-class TracingFileSystemObjectSink : public virtual FileSystemObjectSink
-{
-    FileSystemObjectSink & sink;
-public:
-    TracingFileSystemObjectSink(FileSystemObjectSink & sink)
-        : sink(sink)
-    {
-    }
-
-    void createDirectory(const CanonPath & path) override;
-
-    void createRegularFile(const CanonPath & path, std::function<void(CreateRegularFileSink &)> fn) override;
-
-    void createSymlink(const CanonPath & path, const std::string & target) override;
-};
-
-/**
- * A `ExtendedFileSystemObjectSink` that traces calls, writing to stderr.
- */
-class TracingExtendedFileSystemObjectSink : public TracingFileSystemObjectSink, public ExtendedFileSystemObjectSink
-{
-    ExtendedFileSystemObjectSink & sink;
-public:
-    TracingExtendedFileSystemObjectSink(ExtendedFileSystemObjectSink & sink)
-        : TracingFileSystemObjectSink(sink)
-        , sink(sink)
-    {
-    }
-
-    void createHardlink(const CanonPath & path, const CanonPath & target) override;
-};
-
-}
diff --git a/src/libutil-test-support/tracing-file-system-object-sink.cc b/src/libutil-test-support/tracing-file-system-object-sink.cc
deleted file mode 100644
index 52b081fb8..000000000
--- a/src/libutil-test-support/tracing-file-system-object-sink.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <iostream>
-#include "nix/tracing-file-system-object-sink.hh"
-
-namespace nix::test {
-
-void TracingFileSystemObjectSink::createDirectory(const CanonPath & path)
-{
-    std::cerr << "createDirectory(" << path << ")\n";
-    sink.createDirectory(path);
-}
-
-void TracingFileSystemObjectSink::createRegularFile(
-    const CanonPath & path, std::function<void(CreateRegularFileSink &)> fn)
-{
-    std::cerr << "createRegularFile(" << path << ")\n";
-    sink.createRegularFile(path, [&](CreateRegularFileSink & crf) {
-        // We could wrap this and trace about the chunks of data and such
-        fn(crf);
-    });
-}
-
-void TracingFileSystemObjectSink::createSymlink(const CanonPath & path, const std::string & target)
-{
-    std::cerr << "createSymlink(" << path << ", target: " << target << ")\n";
-    sink.createSymlink(path, target);
-}
-
-void TracingExtendedFileSystemObjectSink::createHardlink(const CanonPath & path, const CanonPath & target)
-{
-    std::cerr << "createHardlink(" << path << ", target: " << target << ")\n";
-    sink.createHardlink(path, target);
-}
-
-} // namespace nix::test