diff options
| author | jade <lix@jade.fyi> | 2024-05-30 02:33:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-05-30 02:33:05 +0000 |
| commit | 562ff516ab27b8e98490646dd30ac96e7e2c36bb (patch) | |
| tree | 1798a20b33da0101bd91acf7da26c891f0cda620 /tests/functional | |
| parent | c71f21da3ac4d95ef9a42a26416ccee71639dbd6 (diff) | |
| parent | a39ba22ff7112cd3984bbf28d8610d84dd525a0f (diff) | |
Merge changes from topic "libutil-split" into main
* changes:
util.hh: Delete remaining file and clean up headers
util.hh: Move nativeSystem to local-derivation-goal.cc
util.hh: Move stuff to types.hh
util.cc: Delete remaining file
util.{hh,cc}: Move ignoreException to error.{hh,cc}
util.{hh,cc}: Split out namespaces.{hh,cc}
util.{hh,cc}: Split out users.{hh,cc}
util.{hh,cc}: Split out strings.{hh,cc}
util.{hh,cc}: Split out unix-domain-socket.{hh,cc}
util.{hh,cc}: Split out child.{hh,cc}
util.{hh,cc}: Split out current-process.{hh,cc}
util.{hh,cc}: Split out processes.{hh,cc}
util.{hh,cc}: Split out file-descriptor.{hh,cc}
util.{hh,cc}: Split out file-system.{hh,cc}
util.{hh,cc}: Split out terminal.{hh,cc}
util.{hh,cc}: Split out environment-variables.{hh,cc}
Diffstat (limited to 'tests/functional')
3 files changed, 4 insertions, 5 deletions
diff --git a/tests/functional/repl_characterization/repl_characterization.cc b/tests/functional/repl_characterization/repl_characterization.cc index 0d3e5352d..c91d6c1e3 100644 --- a/tests/functional/repl_characterization/repl_characterization.cc +++ b/tests/functional/repl_characterization/repl_characterization.cc @@ -6,12 +6,10 @@ #include <string_view> #include <unistd.h> -#include "escape-string.hh" #include "test-session.hh" #include "tests/characterization.hh" #include "tests/cli-literate-parser.hh" -#include "tests/terminal-code-eater.hh" -#include "util.hh" +#include "strings.hh" using namespace std::string_literals; diff --git a/tests/functional/repl_characterization/test-session.cc b/tests/functional/repl_characterization/test-session.cc index c3eb45b85..be3d407f3 100644 --- a/tests/functional/repl_characterization/test-session.cc +++ b/tests/functional/repl_characterization/test-session.cc @@ -3,8 +3,9 @@ #include <unistd.h> #include "test-session.hh" -#include "util.hh" #include "escape-char.hh" +#include "processes.hh" +#include "strings.hh" namespace nix { diff --git a/tests/functional/repl_characterization/test-session.hh b/tests/functional/repl_characterization/test-session.hh index 9961849fc..c77cce6d5 100644 --- a/tests/functional/repl_characterization/test-session.hh +++ b/tests/functional/repl_characterization/test-session.hh @@ -6,7 +6,7 @@ #include <span> #include <string> -#include "util.hh" +#include "file-descriptor.hh" #include "tests/terminal-code-eater.hh" namespace nix { |