Merge "Don't run libstore unit tests in project root" into main

3 files changed, 3 insertions, 3 deletions

diff --git a/tests/unit/libstore/test-data/machines.bad_format b/tests/unit/libstore/data/machines.bad_format
index 7255a1216..7255a1216 100644
--- a/tests/unit/libstore/test-data/machines.bad_format
+++ b/tests/unit/libstore/data/machines.bad_format
diff --git a/tests/unit/libstore/test-data/machines.valid b/tests/unit/libstore/data/machines.valid
index 1a6c8017c..1a6c8017c 100644
--- a/tests/unit/libstore/test-data/machines.valid
+++ b/tests/unit/libstore/data/machines.valid
diff --git a/tests/unit/libstore/machines.cc b/tests/unit/libstore/machines.cc
index 702461926..0277237bb 100644
--- a/tests/unit/libstore/machines.cc
+++ b/tests/unit/libstore/machines.cc
@@ -1,5 +1,6 @@
 #include "machines.hh"
 #include "globals.hh"
+#include "tests/test-data.hh"
 
 #include <gmock/gmock-matchers.h>
 
@@ -17,7 +18,6 @@ using nix::getMachines;
 using nix::Machine;
 using nix::Machines;
 using nix::pathExists;
-using nix::Settings;
 using nix::settings;
 
 class Environment : public ::testing::Environment {
@@ -138,7 +138,7 @@ TEST(machines, getMachinesWithIncorrectFormat) {
 }
 
 TEST(machines, getMachinesWithCorrectFileReference) {
-    auto path = absPath("tests/unit/libstore/test-data/machines.valid");
+    auto path = nix::getUnitTestDataPath("machines.valid");
     ASSERT_TRUE(pathExists(path));
 
     settings.builders = std::string("@") + path;
@@ -165,6 +165,6 @@ TEST(machines, getMachinesWithIncorrectFileReference) {
 }
 
 TEST(machines, getMachinesWithCorrectFileReferenceToIncorrectFile) {
-    settings.builders = std::string("@") + absPath("tests/unit/libstore/test-data/machines.bad_format");
+    settings.builders = std::string("@") + nix::getUnitTestDataPath("machines.bad_format");
     EXPECT_THROW(getMachines(), FormatError);
 }