nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-15 05:21:03 +01:00
Code Activity

More mingw fixes

Browse source
This commit is contained in:
Eelco Dolstra 2025-12-04 17:40:48 +01:00
parent 9246dca541
commit c555af2c77
6 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore-tests/nar-info-disk-cache.cc
View file

@ -14,9 +14,9 @@ TEST(NarInfoDiskCacheImpl, create_and_read)
int prio = 12345;
bool wantMassQuery = true;
Path tmpDir = createTempDir();
auto tmpDir = createTempDir();
AutoDelete delTmpDir(tmpDir);
Path dbPath(tmpDir + "/test-narinfo-disk-cache.sqlite");
auto dbPath(tmpDir / "test-narinfo-disk-cache.sqlite");
int savedId;
int barId;
@ -24,7 +24,7 @@ TEST(NarInfoDiskCacheImpl, create_and_read)
SQLiteStmt getIds;
{
auto cache = getTestNarInfoDiskCache(dbPath);
auto cache = getTestNarInfoDiskCache(dbPath.string());
// Set up "background noise" and check that different caches receive different ids
{
@ -73,7 +73,7 @@ TEST(NarInfoDiskCacheImpl, create_and_read)
{
// We can't clear the in-memory cache, so we use a new cache object. This is
// more realistic anyway.
auto cache2 = getTestNarInfoDiskCache(dbPath);
auto cache2 = getTestNarInfoDiskCache(dbPath.string());
{
auto r = cache2->upToDateCacheExists("http://foo");

6
src/libstore-tests/nix_api_store.cc
View file

@ -212,9 +212,9 @@ TEST_F(nix_api_store_test, nix_store_real_path)
TEST_F(nix_api_util_context, nix_store_real_path_relocated)
{
auto tmp = nix::createTempDir();
std::string storeRoot = tmp / "store";
std::string stateDir = tmp / "state";
std::string logDir = tmp / "log";
auto storeRoot = (tmp / "store").string();
auto stateDir = (tmp / "state").string();
auto logDir = (tmp / "log").string();
const char * rootkv[] = {"root", storeRoot.c_str()};
const char * statekv[] = {"state", stateDir.c_str()};
const char * logkv[] = {"log", logDir.c_str()};