Merge pull request #12958 from DeterminateSystems/unlinked-tests

Fix some unlinked tests

src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh

@@ -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;
-};
-
-}

src/libutil-test-support/tracing-file-system-object-sink.cc

@@ -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

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',

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>