diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functional/binary-cache.sh | 2 | ||||
| -rw-r--r-- | tests/functional/build-remote-trustless-should-fail-0.sh | 2 | ||||
| -rw-r--r-- | tests/functional/ca/derivation-json.sh | 2 | ||||
| -rw-r--r-- | tests/functional/db-migration.sh | 2 | ||||
| -rw-r--r-- | tests/functional/fetchTree-file.sh | 4 | ||||
| -rw-r--r-- | tests/functional/impure-derivations.sh | 2 | ||||
| -rw-r--r-- | tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix | 2 | ||||
| -rw-r--r-- | tests/functional/lang/eval-okay-fromTOML.nix | 2 | ||||
| -rw-r--r-- | tests/functional/nested-sandboxing/command.sh | 2 | ||||
| -rw-r--r-- | tests/functional/repl_characterization/test-session.cc | 2 | ||||
| -rw-r--r-- | tests/installer/default.nix | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/tests/functional/binary-cache.sh b/tests/functional/binary-cache.sh index 7c64a115c..50e23e56c 100644 --- a/tests/functional/binary-cache.sh +++ b/tests/functional/binary-cache.sh @@ -70,7 +70,7 @@ export _NIX_FORCE_HTTP=1 basicDownloadTests -# Test whether Nix notices if the NAR doesn't match the hash in the NAR info. +# Test whether Lix notices if the NAR doesn't match the hash in the NAR info. clearStore nar=$(ls $cacheDir/nar/*.nar.xz | head -n1) diff --git a/tests/functional/build-remote-trustless-should-fail-0.sh b/tests/functional/build-remote-trustless-should-fail-0.sh index 3d4a4b097..1582a7b32 100644 --- a/tests/functional/build-remote-trustless-should-fail-0.sh +++ b/tests/functional/build-remote-trustless-should-fail-0.sh @@ -18,7 +18,7 @@ nix-build build-hook.nix -A passthru.input2 \ --store "$TEST_ROOT/local" \ --option system-features bar -# Now when we go to build that downstream derivation, Nix will try to +# Now when we go to build that downstream derivation, Lix will try to # copy our already-build `input2` to the remote store. That store object # is input-addressed, so this will fail. diff --git a/tests/functional/ca/derivation-json.sh b/tests/functional/ca/derivation-json.sh index c1480fd17..318a32ce0 100644 --- a/tests/functional/ca/derivation-json.sh +++ b/tests/functional/ca/derivation-json.sh @@ -17,7 +17,7 @@ drvPath3=$(nix derivation add --dry-run < $TEST_HOME/foo.json) [[ ! -e "$drvPath3" ]] # But the JSON is rejected without the experimental feature -expectStderr 1 nix derivation add < $TEST_HOME/foo.json --experimental-features nix-command | grepQuiet "experimental Nix feature 'ca-derivations' is disabled" +expectStderr 1 nix derivation add < $TEST_HOME/foo.json --experimental-features nix-command | grepQuiet "experimental Lix feature 'ca-derivations' is disabled" # Without --dry-run it is actually written drvPath4=$(nix derivation add < $TEST_HOME/foo.json) diff --git a/tests/functional/db-migration.sh b/tests/functional/db-migration.sh index 44cd16bc0..7346e32f6 100644 --- a/tests/functional/db-migration.sh +++ b/tests/functional/db-migration.sh @@ -2,7 +2,7 @@ source common.sh -# Only run this if we have an older Nix available +# Only run this if we have an older Lix available # XXX: This assumes that the `daemon` package is older than the `client` one if [[ -z "${NIX_DAEMON_PACKAGE-}" ]]; then skipTest "not using the Nix daemon" diff --git a/tests/functional/fetchTree-file.sh b/tests/functional/fetchTree-file.sh index 6395c133d..7dbc7667c 100644 --- a/tests/functional/fetchTree-file.sh +++ b/tests/functional/fetchTree-file.sh @@ -72,7 +72,7 @@ EOF # old 'tarball' fetcher should still have their type set to 'tarball' assert (nodes.tarball_default_unpack.locked.type == "tarball"); # Unless explicitely specified, the 'unpack' parameter shouldn’t appear here - # because that would break older Nix versions + # because that would break older Nix implementation versions assert (!nodes.tarball_default_unpack.locked ? unpack); assert (nodes.tarball_default_unpack.locked.narHash == "$input_directory_hash"); @@ -94,7 +94,7 @@ EOF [[ -z "${NIX_DAEMON_PACKAGE-}" ]] && return 0 # Ensure that a lockfile generated by the current Nix for tarball inputs - # can still be read by an older Nix + # can still be read by an older Nix implementation cat <<EOF > flake.nix { diff --git a/tests/functional/impure-derivations.sh b/tests/functional/impure-derivations.sh index 39d053a04..38be4234e 100644 --- a/tests/functional/impure-derivations.sh +++ b/tests/functional/impure-derivations.sh @@ -17,7 +17,7 @@ drvPath2=$(nix derivation add < $TEST_HOME/impure-drv.json) [[ "$drvPath" = "$drvPath2" ]] # But only with the experimental feature! -expectStderr 1 nix derivation add < $TEST_HOME/impure-drv.json --experimental-features nix-command | grepQuiet "experimental Nix feature 'impure-derivations' is disabled" +expectStderr 1 nix derivation add < $TEST_HOME/impure-drv.json --experimental-features nix-command | grepQuiet "experimental Lix feature 'impure-derivations' is disabled" nix build --dry-run --json --file ./impure-derivations.nix impure.all json=$(nix build -L --no-link --json --file ./impure-derivations.nix impure.all) diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix b/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix index abcd5366a..148e94954 100644 --- a/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix +++ b/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix @@ -1,5 +1,5 @@ # Checks that the nul value for the accumulator is not forced unconditionally. -# Some languages provide a foldl' that is strict in this argument, but Nix does not. +# Some languages provide a foldl' that is strict in this argument, but Nix language does not. builtins.foldl' (_: x: x) (throw "This is never forced") diff --git a/tests/functional/lang/eval-okay-fromTOML.nix b/tests/functional/lang/eval-okay-fromTOML.nix index 963932689..4704b62cc 100644 --- a/tests/functional/lang/eval-okay-fromTOML.nix +++ b/tests/functional/lang/eval-okay-fromTOML.nix @@ -89,7 +89,7 @@ bool1 = true bool2 = false - # FIXME: not supported because Nix doesn't have a date/time type. + # FIXME: not supported because Nix language doesn't have a date/time type. #odt1 = 1979-05-27T07:32:00Z #odt2 = 1979-05-27T00:32:00-07:00 #odt3 = 1979-05-27T00:32:00.999999-07:00 diff --git a/tests/functional/nested-sandboxing/command.sh b/tests/functional/nested-sandboxing/command.sh index 69366486c..f35fff9ed 100644 --- a/tests/functional/nested-sandboxing/command.sh +++ b/tests/functional/nested-sandboxing/command.sh @@ -1,5 +1,5 @@ export NIX_BIN_DIR=$(dirname $(type -p nix)) -# TODO Get Nix and its closure more flexibly +# TODO Get Lix and its closure more flexibly export EXTRA_SANDBOX="/nix/store $(dirname $NIX_BIN_DIR)" badStoreUrl () { diff --git a/tests/functional/repl_characterization/test-session.cc b/tests/functional/repl_characterization/test-session.cc index be3d407f3..e59064fc5 100644 --- a/tests/functional/repl_characterization/test-session.cc +++ b/tests/functional/repl_characterization/test-session.cc @@ -173,7 +173,7 @@ void TestSession::runCommand(std::string command) std::cerr << "runCommand " << command << "\n"; } command += "\n"; - // We have to feed a newline into the output parser, since Nix might not + // We have to feed a newline into the output parser, since Lix might not // give us a newline before a prompt in all cases (it might clear line // first, e.g.) outputParser.feed('\n'); diff --git a/tests/installer/default.nix b/tests/installer/default.nix index 49cfd2bcc..6d3e19987 100644 --- a/tests/installer/default.nix +++ b/tests/installer/default.nix @@ -202,7 +202,7 @@ let # use a plain tarpipe instead tar -C ${mockChannel pkgs} -c channel | ssh -p 20022 $ssh_opts vagrant@localhost tar x -f- - echo "Testing Nix installation..." + echo "Testing Lix installation..." $ssh <<EOF set -ex |