diff options
| author | Tom Hubrecht <github@mail.hubrecht.ovh> | 2024-05-28 16:53:21 +0200 |
|---|---|---|
| committer | Tom Hubrecht <github@mail.hubrecht.ovh> | 2024-05-29 12:38:51 +0200 |
| commit | a39ba22ff7112cd3984bbf28d8610d84dd525a0f (patch) | |
| tree | 234f26a44798f318baf3b6a3c318390d30c50b0e /tests/unit | |
| parent | f0eb650ee8a0eb5244c15fab3b152a1f70e1506e (diff) | |
util.hh: Delete remaining file and clean up headers
Change-Id: Ic1f68e6af658e94ef7922841dd3ad4c69551ef56
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/libcmd/args.cc | 1 | ||||
| -rw-r--r-- | tests/unit/libstore-support/tests/test-data.hh | 2 | ||||
| -rw-r--r-- | tests/unit/libutil-support/tests/characterization.hh | 1 | ||||
| -rw-r--r-- | tests/unit/libutil-support/tests/cli-literate-parser.cc | 2 | ||||
| -rw-r--r-- | tests/unit/libutil/logging.cc | 1 | ||||
| -rw-r--r-- | tests/unit/libutil/tests.cc | 3 |
6 files changed, 2 insertions, 8 deletions
diff --git a/tests/unit/libcmd/args.cc b/tests/unit/libcmd/args.cc index 73550dacf..886467ea0 100644 --- a/tests/unit/libcmd/args.cc +++ b/tests/unit/libcmd/args.cc @@ -10,7 +10,6 @@ #include "filetransfer.hh" #include "shared.hh" #include "store-api.hh" -#include "util.hh" constexpr std::string_view INVALID_CHANNEL = "channel:example"; constexpr std::string_view CHANNEL_URL = "https://nixos.org/channels/example/nixexprs.tar.xz"; diff --git a/tests/unit/libstore-support/tests/test-data.hh b/tests/unit/libstore-support/tests/test-data.hh index 7aa1dd90d..1fec6f912 100644 --- a/tests/unit/libstore-support/tests/test-data.hh +++ b/tests/unit/libstore-support/tests/test-data.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "environment-variables.hh" #include "types.hh" namespace nix { diff --git a/tests/unit/libutil-support/tests/characterization.hh b/tests/unit/libutil-support/tests/characterization.hh index 472fdba3b..db82476da 100644 --- a/tests/unit/libutil-support/tests/characterization.hh +++ b/tests/unit/libutil-support/tests/characterization.hh @@ -8,7 +8,6 @@ #include <filesystem> -#include "util.hh" #include "types.hh" namespace nix { diff --git a/tests/unit/libutil-support/tests/cli-literate-parser.cc b/tests/unit/libutil-support/tests/cli-literate-parser.cc index 69bf9fb46..f74fe85eb 100644 --- a/tests/unit/libutil-support/tests/cli-literate-parser.cc +++ b/tests/unit/libutil-support/tests/cli-literate-parser.cc @@ -3,7 +3,6 @@ #include "escape-char.hh" #include "libexpr/print.hh" #include "types.hh" -#include "util.hh" #include <ranges> #include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/trim.hpp> @@ -18,7 +17,6 @@ #include "libexpr/print.hh" #include "shlex.hh" #include "types.hh" -#include "util.hh" #include "strings.hh" static constexpr const bool DEBUG_PARSER = false; diff --git a/tests/unit/libutil/logging.cc b/tests/unit/libutil/logging.cc index 94cbe9c51..f99f49527 100644 --- a/tests/unit/libutil/logging.cc +++ b/tests/unit/libutil/logging.cc @@ -2,7 +2,6 @@ #include "logging.hh" #include "nixexpr.hh" -#include "util.hh" #include <fstream> #include <gtest/gtest.h> diff --git a/tests/unit/libutil/tests.cc b/tests/unit/libutil/tests.cc index 324ebd335..9a44ad59b 100644 --- a/tests/unit/libutil/tests.cc +++ b/tests/unit/libutil/tests.cc @@ -3,7 +3,6 @@ #include "strings.hh" #include "types.hh" #include "terminal.hh" -#include "util.hh" #include <gtest/gtest.h> @@ -11,7 +10,7 @@ namespace nix { -/* ----------- tests for util.hh ------------------------------------------------*/ +/* ----------- tests for libutil ------------------------------------------------*/ /* ---------------------------------------------------------------------------- * absPath |