From 6fd6795bc4faed644c5f3abafdcb21638a119342 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 10:50:54 +0200 Subject: util.{hh,cc}: Split out environment-variables.{hh,cc} Change-Id: Icff0aa33fda5147bd5dbe256a0b9d6a6c8a2c3f6 --- tests/unit/libutil-support/tests/characterization.hh | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/unit') diff --git a/tests/unit/libutil-support/tests/characterization.hh b/tests/unit/libutil-support/tests/characterization.hh index 7f570f619..9de20d02c 100644 --- a/tests/unit/libutil-support/tests/characterization.hh +++ b/tests/unit/libutil-support/tests/characterization.hh @@ -1,6 +1,7 @@ #pragma once ///@file +#include "environment-variables.hh" #include #include -- cgit v1.2.3 From 81bdf8d2d672e135e68745e6975ad5edafadf13a Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 11:19:08 +0200 Subject: util.{hh,cc}: Split out terminal.{hh,cc} Change-Id: I9de2296b4012d50f540124001d54d6ca3be4c6da --- tests/unit/libutil/tests.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/unit') diff --git a/tests/unit/libutil/tests.cc b/tests/unit/libutil/tests.cc index 720370066..787f79093 100644 --- a/tests/unit/libutil/tests.cc +++ b/tests/unit/libutil/tests.cc @@ -1,5 +1,6 @@ #include "util.hh" #include "types.hh" +#include "terminal.hh" #include #include -- cgit v1.2.3 From 6b5078c81554ddb36547f8c41805cc94b7738396 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 11:52:13 +0200 Subject: util.{hh,cc}: Split out file-system.{hh,cc} Change-Id: Ifa89a529e7e34e7291eca87d802d2f569cf2493e --- tests/unit/libstore/machines.cc | 1 + tests/unit/libutil-support/tests/characterization.hh | 2 ++ tests/unit/libutil/tests.cc | 1 + 3 files changed, 4 insertions(+) (limited to 'tests/unit') diff --git a/tests/unit/libstore/machines.cc b/tests/unit/libstore/machines.cc index 0277237bb..dc192e5be 100644 --- a/tests/unit/libstore/machines.cc +++ b/tests/unit/libstore/machines.cc @@ -1,3 +1,4 @@ +#include "file-system.hh" #include "machines.hh" #include "globals.hh" #include "tests/test-data.hh" diff --git a/tests/unit/libutil-support/tests/characterization.hh b/tests/unit/libutil-support/tests/characterization.hh index 9de20d02c..472fdba3b 100644 --- a/tests/unit/libutil-support/tests/characterization.hh +++ b/tests/unit/libutil-support/tests/characterization.hh @@ -2,6 +2,8 @@ ///@file #include "environment-variables.hh" +#include "file-system.hh" + #include #include diff --git a/tests/unit/libutil/tests.cc b/tests/unit/libutil/tests.cc index 787f79093..c8dc82cb0 100644 --- a/tests/unit/libutil/tests.cc +++ b/tests/unit/libutil/tests.cc @@ -1,3 +1,4 @@ +#include "file-system.hh" #include "util.hh" #include "types.hh" #include "terminal.hh" -- cgit v1.2.3 From 9a52e4688ca265155817817f373938428f023966 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 13:14:13 +0200 Subject: util.{hh,cc}: Split out processes.{hh,cc} Change-Id: I39280dc40ca3f7f9007bc6c898ffcf760e2238b7 --- tests/unit/libutil/tests.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/unit') diff --git a/tests/unit/libutil/tests.cc b/tests/unit/libutil/tests.cc index c8dc82cb0..a42afd997 100644 --- a/tests/unit/libutil/tests.cc +++ b/tests/unit/libutil/tests.cc @@ -1,9 +1,9 @@ #include "file-system.hh" #include "util.hh" +#include "processes.hh" #include "types.hh" #include "terminal.hh" -#include #include #include -- cgit v1.2.3 From b91055112035c256fffd44d77f746b977cfdf3ca Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 14:57:20 +0200 Subject: util.{hh,cc}: Split out strings.{hh,cc} Change-Id: I4f642d1046d56b5db26f1b0296ee16a0e02d444a --- tests/unit/libstore/machines.cc | 1 + tests/unit/libutil-support/tests/cli-literate-parser.cc | 1 + tests/unit/libutil/tests.cc | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/unit') diff --git a/tests/unit/libstore/machines.cc b/tests/unit/libstore/machines.cc index dc192e5be..ba27d85b7 100644 --- a/tests/unit/libstore/machines.cc +++ b/tests/unit/libstore/machines.cc @@ -1,6 +1,7 @@ #include "file-system.hh" #include "machines.hh" #include "globals.hh" +#include "strings.hh" #include "tests/test-data.hh" #include diff --git a/tests/unit/libutil-support/tests/cli-literate-parser.cc b/tests/unit/libutil-support/tests/cli-literate-parser.cc index 822f5e276..69bf9fb46 100644 --- a/tests/unit/libutil-support/tests/cli-literate-parser.cc +++ b/tests/unit/libutil-support/tests/cli-literate-parser.cc @@ -19,6 +19,7 @@ #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/tests.cc b/tests/unit/libutil/tests.cc index a42afd997..324ebd335 100644 --- a/tests/unit/libutil/tests.cc +++ b/tests/unit/libutil/tests.cc @@ -1,8 +1,9 @@ #include "file-system.hh" -#include "util.hh" #include "processes.hh" +#include "strings.hh" #include "types.hh" #include "terminal.hh" +#include "util.hh" #include -- cgit v1.2.3 From a39ba22ff7112cd3984bbf28d8610d84dd525a0f Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 16:53:21 +0200 Subject: util.hh: Delete remaining file and clean up headers Change-Id: Ic1f68e6af658e94ef7922841dd3ad4c69551ef56 --- tests/unit/libcmd/args.cc | 1 - tests/unit/libstore-support/tests/test-data.hh | 2 +- tests/unit/libutil-support/tests/characterization.hh | 1 - tests/unit/libutil-support/tests/cli-literate-parser.cc | 2 -- tests/unit/libutil/logging.cc | 1 - tests/unit/libutil/tests.cc | 3 +-- 6 files changed, 2 insertions(+), 8 deletions(-) (limited to 'tests/unit') 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 -#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 #include #include @@ -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 #include 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 @@ -11,7 +10,7 @@ namespace nix { -/* ----------- tests for util.hh ------------------------------------------------*/ +/* ----------- tests for libutil ------------------------------------------------*/ /* ---------------------------------------------------------------------------- * absPath -- cgit v1.2.3