nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 20:16:03 +01:00
Code Activity

libstore-tests: Restore commented out tests

Browse source
This commit is contained in:
Sergei Zimmerman 2025-08-11 19:42:39 +03:00
parent 2c38ad2cfa
commit 73ebdf2497
No known key found for this signature in database
4 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore-tests/local-overlay-store.cc
View file

@ -1,9 +1,6 @@
// FIXME: Odd failures for templates that are causing the PR to break #include <gtest/gtest.h>
// for now with discussion with @Ericson2314 to comment out.
#if 0
# include <gtest/gtest.h>
# include "nix/store/local-overlay-store.hh" #include "nix/store/local-overlay-store.hh"
namespace nix { namespace nix {
@ -31,4 +28,3 @@ TEST(LocalOverlayStore, constructConfig_rootPath)
} }
} // namespace nix } // namespace nix
#endif

14
src/libstore-tests/local-store.cc
View file

@ -1,15 +1,12 @@
// FIXME: Odd failures for templates that are causing the PR to break #include <gtest/gtest.h>
// for now with discussion with @Ericson2314 to comment out.
#if 0
# include <gtest/gtest.h>
# include "nix/store/local-store.hh" #include "nix/store/local-store.hh"
// Needed for template specialisations. This is not good! When we // Needed for template specialisations. This is not good! When we
// overhaul how store configs work, this should be fixed. // overhaul how store configs work, this should be fixed.
# include "nix/util/args.hh" #include "nix/util/args.hh"
# include "nix/util/config-impl.hh" #include "nix/util/config-impl.hh"
# include "nix/util/abstract-setting-to-json.hh" #include "nix/util/abstract-setting-to-json.hh"
namespace nix { namespace nix {
@ -37,4 +34,3 @@ TEST(LocalStore, constructConfig_rootPath)
} }
} // namespace nix } // namespace nix
#endif

12
src/libstore-tests/ssh-store.cc
View file

@ -1,9 +1,8 @@
// FIXME: Odd failures for templates that are causing the PR to break #include <gtest/gtest.h>
// for now with discussion with @Ericson2314 to comment out.
#if 0
# include <gtest/gtest.h>
# include "nix/store/ssh-store.hh" #include "nix/store/ssh-store.hh"
#include "nix/util/config-impl.hh"
#include "nix/util/abstract-setting-to-json.hh"
namespace nix { namespace nix {
@ -51,5 +50,4 @@ TEST(MountedSSHStore, constructConfig)
})); }));
} }
} } // namespace nix
#endif

8
src/libstore-tests/uds-remote-store.cc
View file

@ -1,9 +1,6 @@
// FIXME: Odd failures for templates that are causing the PR to break #include <gtest/gtest.h>
// for now with discussion with @Ericson2314 to comment out.
#if 0
# include <gtest/gtest.h>
# include "nix/store/uds-remote-store.hh" #include "nix/store/uds-remote-store.hh"
namespace nix { namespace nix {
@ -20,4 +17,3 @@ TEST(UDSRemoteStore, constructConfigWrongScheme)
} }
} // namespace nix } // namespace nix
#endif