diff --git a/tests/ca/config.nix b/tests/ca/config.nix deleted file mode 100644 index 2d076e97a..000000000 --- a/tests/ca/config.nix +++ /dev/null @@ -1,27 +0,0 @@ -let - contentAddressedByDefault = builtins.getEnv "NIX_TESTS_CA_BY_DEFAULT" == "1"; - caArgs = if contentAddressedByDefault then { - __contentAddressed = true; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - } else {}; -in - -rec { - shell = "/nix/store/dsd5gz46hdbdk2rfdimqddhq6m8m8fqs-bash-5.1-p16/bin/bash"; - - path = "/nix/store/a7gvj343m05j2s32xcnwr35v31ynlypr-coreutils-9.1/bin"; - - system = "x86_64-linux"; - - shared = builtins.getEnv "_NIX_TEST_SHARED"; - - mkDerivation = args: - derivation ({ - inherit system; - builder = shell; - args = ["-e" args.builder or (builtins.toFile "builder-${args.name}.sh" "if [ -e .attrs.sh ]; then source .attrs.sh; fi; eval \"$buildCommand\"")]; - PATH = path; - } // caArgs // removeAttrs args ["builder" "meta"]) - // { meta = args.meta or {}; }; -} diff --git a/tests/common/vars-and-functions.sh b/tests/common/vars-and-functions.sh deleted file mode 100644 index df7a4d8d0..000000000 --- a/tests/common/vars-and-functions.sh +++ /dev/null @@ -1,269 +0,0 @@ -set -eu -o pipefail - -if [[ -z "${COMMON_VARS_AND_FUNCTIONS_SH_SOURCED-}" ]]; then - -COMMON_VARS_AND_FUNCTIONS_SH_SOURCED=1 - -export PS4='+(${BASH_SOURCE[0]}:$LINENO) ' - -export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test)/${TEST_NAME:-default} -export NIX_STORE_DIR -if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then - # Maybe the build directory is symlinked. - export NIX_IGNORE_SYMLINK_STORE=1 - NIX_STORE_DIR=$TEST_ROOT/store -fi -export NIX_LOCALSTATE_DIR=$TEST_ROOT/var -export NIX_LOG_DIR=$TEST_ROOT/var/log/nix -export NIX_STATE_DIR=$TEST_ROOT/var/nix -export NIX_CONF_DIR=$TEST_ROOT/etc -export NIX_DAEMON_SOCKET_PATH=$TEST_ROOT/dSocket -unset NIX_USER_CONF_FILES -export _NIX_TEST_SHARED=$TEST_ROOT/shared -if [[ -n $NIX_STORE ]]; then - export _NIX_TEST_NO_SANDBOX=1 -fi -export _NIX_IN_TEST=$TEST_ROOT/shared -export _NIX_TEST_NO_LSOF=1 -export NIX_REMOTE=${NIX_REMOTE_-} -unset NIX_PATH -export TEST_HOME=$TEST_ROOT/test-home -export HOME=$TEST_HOME -unset XDG_STATE_HOME -unset XDG_DATA_HOME -unset XDG_CONFIG_HOME -unset XDG_CONFIG_DIRS -unset XDG_CACHE_HOME -mkdir -p $TEST_HOME - -export PATH=/home/bmc/sources/nix/outputs/out/bin:$PATH -if [[ -n "${NIX_CLIENT_PACKAGE:-}" ]]; then - export PATH="$NIX_CLIENT_PACKAGE/bin":$PATH -fi -DAEMON_PATH="$PATH" -if [[ -n "${NIX_DAEMON_PACKAGE:-}" ]]; then - DAEMON_PATH="${NIX_DAEMON_PACKAGE}/bin:$DAEMON_PATH" -fi -coreutils=/nix/store/a7gvj343m05j2s32xcnwr35v31ynlypr-coreutils-9.1/bin - -export dot= -export SHELL="/nix/store/dsd5gz46hdbdk2rfdimqddhq6m8m8fqs-bash-5.1-p16/bin/bash" -export PAGER=cat -export busybox="/nix/store/7b943a2k4amjmam6dnwnxnj8qbba9lbq-busybox-static-x86_64-unknown-linux-musl-1.35.0/bin/busybox" - -export version=2.15.0 -export system=x86_64-linux - -export BUILD_SHARED_LIBS=1 - -export IMPURE_VAR1=foo -export IMPURE_VAR2=bar - -cacheDir=$TEST_ROOT/binary-cache - -readLink() { - ls -l "$1" | sed 's/.*->\ //' -} - -clearProfiles() { - profiles="$HOME"/.local/state/nix/profiles - rm -rf "$profiles" -} - -clearStore() { - echo "clearing store..." - chmod -R +w "$NIX_STORE_DIR" - rm -rf "$NIX_STORE_DIR" - mkdir "$NIX_STORE_DIR" - rm -rf "$NIX_STATE_DIR" - mkdir "$NIX_STATE_DIR" - clearProfiles -} - -clearCache() { - rm -rf "$cacheDir" -} - -clearCacheCache() { - rm -f $TEST_HOME/.cache/nix/binary-cache* -} - -startDaemon() { - # Don’t start the daemon twice, as this would just make it loop indefinitely - if [[ "${_NIX_TEST_DAEMON_PID-}" != '' ]]; then - return - fi - # Start the daemon, wait for the socket to appear. - rm -f $NIX_DAEMON_SOCKET_PATH - PATH=$DAEMON_PATH nix-daemon & - _NIX_TEST_DAEMON_PID=$! - export _NIX_TEST_DAEMON_PID - for ((i = 0; i < 300; i++)); do - if [[ -S $NIX_DAEMON_SOCKET_PATH ]]; then - DAEMON_STARTED=1 - break; - fi - sleep 0.1 - done - if [[ -z ${DAEMON_STARTED+x} ]]; then - fail "Didn’t manage to start the daemon" - fi - trap "killDaemon" EXIT - # Save for if daemon is killed - NIX_REMOTE_OLD=$NIX_REMOTE - export NIX_REMOTE=daemon -} - -killDaemon() { - # Don’t fail trying to stop a non-existant daemon twice - if [[ "${_NIX_TEST_DAEMON_PID-}" == '' ]]; then - return - fi - kill $_NIX_TEST_DAEMON_PID - for i in {0..100}; do - kill -0 $_NIX_TEST_DAEMON_PID 2> /dev/null || break - sleep 0.1 - done - kill -9 $_NIX_TEST_DAEMON_PID 2> /dev/null || true - wait $_NIX_TEST_DAEMON_PID || true - rm -f $NIX_DAEMON_SOCKET_PATH - # Indicate daemon is stopped - unset _NIX_TEST_DAEMON_PID - # Restore old nix remote - NIX_REMOTE=$NIX_REMOTE_OLD - trap "" EXIT -} - -restartDaemon() { - [[ -z "${_NIX_TEST_DAEMON_PID:-}" ]] && return 0 - - killDaemon - startDaemon -} - -if [[ $(uname) == Linux ]] && [[ -L /proc/self/ns/user ]] && unshare --user true; then - _canUseSandbox=1 -fi - -isDaemonNewer () { - [[ -n "${NIX_DAEMON_PACKAGE:-}" ]] || return 0 - local requiredVersion="$1" - local daemonVersion=$($NIX_DAEMON_PACKAGE/bin/nix-daemon --version | cut -d' ' -f3) - [[ $(nix eval --expr "builtins.compareVersions ''$daemonVersion'' ''$requiredVersion''") -ge 0 ]] -} - -requireDaemonNewerThan () { - isDaemonNewer "$1" || exit 99 -} - -canUseSandbox() { - if [[ ! ${_canUseSandbox-} ]]; then - echo "Sandboxing not supported, skipping this test..." - return 1 - fi - - return 0 -} - -fail() { - echo "$1" - exit 1 -} - -# Run a command failing if it didn't exit with the expected exit code. -# -# Has two advantages over the built-in `!`: -# -# 1. `!` conflates all non-0 codes. `expect` allows testing for an exact -# code. -# -# 2. `!` unexpectedly negates `set -e`, and cannot be used on individual -# pipeline stages with `set -o pipefail`. It only works on the entire -# pipeline, which is useless if we want, say, `nix ...` invocation to -# *fail*, but a grep on the error message it outputs to *succeed*. -expect() { - local expected res - expected="$1" - shift - "$@" && res=0 || res="$?" - if [[ $res -ne $expected ]]; then - echo "Expected '$expected' but got '$res' while running '${*@Q}'" >&2 - return 1 - fi - return 0 -} - -# Better than just doing `expect ... >&2` because the "Expected..." -# message below will *not* be redirected. -expectStderr() { - local expected res - expected="$1" - shift - "$@" 2>&1 && res=0 || res="$?" - if [[ $res -ne $expected ]]; then - echo "Expected '$expected' but got '$res' while running '${*@Q}'" >&2 - return 1 - fi - return 0 -} - -needLocalStore() { - if [[ "$NIX_REMOTE" == "daemon" ]]; then - echo "Can’t run through the daemon ($1), skipping this test..." - return 99 - fi -} - -# Just to make it easy to find which tests should be fixed -buggyNeedLocalStore() { - needLocalStore "$1" -} - -enableFeatures() { - local features="$1" - sed -i 's/experimental-features .*/& '"$features"'/' "$NIX_CONF_DIR"/nix.conf -} - -set -x - -onError() { - set +x - echo "$0: test failed at:" >&2 - for ((i = 1; i < ${#BASH_SOURCE[@]}; i++)); do - if [[ -z ${BASH_SOURCE[i]} ]]; then break; fi - echo " ${FUNCNAME[i]} in ${BASH_SOURCE[i]}:${BASH_LINENO[i-1]}" >&2 - done -} - -# `grep -v` doesn't work well for exit codes. We want `!(exist line l. l -# matches)`. It gives us `exist line l. !(l matches)`. -# -# `!` normally doesn't work well with `set -e`, but when we wrap in a -# function it *does*. -grepInverse() { - ! grep "$@" -} - -# A shorthand, `> /dev/null` is a bit noisy. -# -# `grep -q` would seem to do this, no function necessary, but it is a -# bad fit with pipes and `set -o pipefail`: `-q` will exit after the -# first match, and then subsequent writes will result in broken pipes. -# -# Note that reproducing the above is a bit tricky as it depends on -# non-deterministic properties such as the timing between the match and -# the closing of the pipe, the buffering of the pipe, and the speed of -# the producer into the pipe. But rest assured we've seen it happen in -# CI reliably. -grepQuiet() { - grep "$@" > /dev/null -} - -# The previous two, combined -grepQuietInverse() { - ! grep "$@" > /dev/null -} - -trap onError ERR - -fi # COMMON_VARS_AND_FUNCTIONS_SH_SOURCED diff --git a/tests/config.nix b/tests/config.nix deleted file mode 100644 index 2d076e97a..000000000 --- a/tests/config.nix +++ /dev/null @@ -1,27 +0,0 @@ -let - contentAddressedByDefault = builtins.getEnv "NIX_TESTS_CA_BY_DEFAULT" == "1"; - caArgs = if contentAddressedByDefault then { - __contentAddressed = true; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - } else {}; -in - -rec { - shell = "/nix/store/dsd5gz46hdbdk2rfdimqddhq6m8m8fqs-bash-5.1-p16/bin/bash"; - - path = "/nix/store/a7gvj343m05j2s32xcnwr35v31ynlypr-coreutils-9.1/bin"; - - system = "x86_64-linux"; - - shared = builtins.getEnv "_NIX_TEST_SHARED"; - - mkDerivation = args: - derivation ({ - inherit system; - builder = shell; - args = ["-e" args.builder or (builtins.toFile "builder-${args.name}.sh" "if [ -e .attrs.sh ]; then source .attrs.sh; fi; eval \"$buildCommand\"")]; - PATH = path; - } // caArgs // removeAttrs args ["builder" "meta"]) - // { meta = args.meta or {}; }; -} diff --git a/tests/lang/eval-okay-any-all.out b/tests/lang/eval-okay-any-all.out deleted file mode 100644 index eb273f45b..000000000 --- a/tests/lang/eval-okay-any-all.out +++ /dev/null @@ -1 +0,0 @@ -[ false false true true true true false true ] diff --git a/tests/lang/eval-okay-arithmetic.out b/tests/lang/eval-okay-arithmetic.out deleted file mode 100644 index 5c54d10b7..000000000 --- a/tests/lang/eval-okay-arithmetic.out +++ /dev/null @@ -1 +0,0 @@ -2216 diff --git a/tests/lang/eval-okay-attrnames.out b/tests/lang/eval-okay-attrnames.out deleted file mode 100644 index b4aa387e0..000000000 --- a/tests/lang/eval-okay-attrnames.out +++ /dev/null @@ -1 +0,0 @@ -"newxfoonewxy" diff --git a/tests/lang/eval-okay-attrs.out b/tests/lang/eval-okay-attrs.out deleted file mode 100644 index 45b0f829e..000000000 --- a/tests/lang/eval-okay-attrs.out +++ /dev/null @@ -1 +0,0 @@ -987 diff --git a/tests/lang/eval-okay-attrs2.out b/tests/lang/eval-okay-attrs2.out deleted file mode 100644 index 45b0f829e..000000000 --- a/tests/lang/eval-okay-attrs2.out +++ /dev/null @@ -1 +0,0 @@ -987 diff --git a/tests/lang/eval-okay-attrs3.out b/tests/lang/eval-okay-attrs3.out deleted file mode 100644 index 19de4fdf7..000000000 --- a/tests/lang/eval-okay-attrs3.out +++ /dev/null @@ -1 +0,0 @@ -"foo 22 80 itchyxac" diff --git a/tests/lang/eval-okay-attrs4.out b/tests/lang/eval-okay-attrs4.out deleted file mode 100644 index 185173144..000000000 --- a/tests/lang/eval-okay-attrs4.out +++ /dev/null @@ -1 +0,0 @@ -[ true false true false false true false false ] diff --git a/tests/lang/eval-okay-attrs5.out b/tests/lang/eval-okay-attrs5.out deleted file mode 100644 index ce0430d78..000000000 --- a/tests/lang/eval-okay-attrs5.out +++ /dev/null @@ -1 +0,0 @@ -[ 123 "foo" 456 456 "foo" "xyzzy" "xyzzy" true ] diff --git a/tests/lang/eval-okay-attrs6.out b/tests/lang/eval-okay-attrs6.out deleted file mode 100644 index b46938032..000000000 --- a/tests/lang/eval-okay-attrs6.out +++ /dev/null @@ -1 +0,0 @@ -{ __overrides = { bar = "qux"; }; bar = "qux"; foo = "bar"; } diff --git a/tests/lang/eval-okay-autoargs.out b/tests/lang/eval-okay-autoargs.out deleted file mode 100644 index 7a8391786..000000000 --- a/tests/lang/eval-okay-autoargs.out +++ /dev/null @@ -1 +0,0 @@ -"xyzzy!xyzzy!foobar" diff --git a/tests/lang/eval-okay-backslash-newline-1.out b/tests/lang/eval-okay-backslash-newline-1.out deleted file mode 100644 index 3e754364c..000000000 --- a/tests/lang/eval-okay-backslash-newline-1.out +++ /dev/null @@ -1 +0,0 @@ -"a\nb" diff --git a/tests/lang/eval-okay-backslash-newline-2.out b/tests/lang/eval-okay-backslash-newline-2.out deleted file mode 100644 index 3e754364c..000000000 --- a/tests/lang/eval-okay-backslash-newline-2.out +++ /dev/null @@ -1 +0,0 @@ -"a\nb" diff --git a/tests/lang/eval-okay-builtins-add.out b/tests/lang/eval-okay-builtins-add.out deleted file mode 100644 index 0350b518a..000000000 --- a/tests/lang/eval-okay-builtins-add.out +++ /dev/null @@ -1 +0,0 @@ -[ 5 4 "int" "tt" "float" 4 ] diff --git a/tests/lang/eval-okay-builtins.out b/tests/lang/eval-okay-builtins.out deleted file mode 100644 index 0661686d6..000000000 --- a/tests/lang/eval-okay-builtins.out +++ /dev/null @@ -1 +0,0 @@ -/foo diff --git a/tests/lang/eval-okay-callable-attrs.out b/tests/lang/eval-okay-callable-attrs.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-callable-attrs.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-catattrs.out b/tests/lang/eval-okay-catattrs.out deleted file mode 100644 index b4a1e66d6..000000000 --- a/tests/lang/eval-okay-catattrs.out +++ /dev/null @@ -1 +0,0 @@ -[ 1 2 ] diff --git a/tests/lang/eval-okay-closure.out b/tests/lang/eval-okay-closure.out deleted file mode 100644 index e7dbf9781..000000000 --- a/tests/lang/eval-okay-closure.out +++ /dev/null @@ -1 +0,0 @@ -[ { foo = true; key = -13; } { foo = true; key = -12; } { foo = true; key = -11; } { foo = true; key = -9; } { foo = true; key = -8; } { foo = true; key = -7; } { foo = true; key = -5; } { foo = true; key = -4; } { foo = true; key = -3; } { key = -1; } { foo = true; key = 0; } { foo = true; key = 1; } { foo = true; key = 2; } { foo = true; key = 4; } { foo = true; key = 5; } { foo = true; key = 6; } { key = 8; } { foo = true; key = 9; } { foo = true; key = 10; } { foo = true; key = 13; } { foo = true; key = 14; } { foo = true; key = 15; } { key = 17; } { foo = true; key = 18; } { foo = true; key = 19; } { foo = true; key = 22; } { foo = true; key = 23; } { key = 26; } { foo = true; key = 27; } { foo = true; key = 28; } { foo = true; key = 31; } { foo = true; key = 32; } { key = 35; } { foo = true; key = 36; } { foo = true; key = 40; } { foo = true; key = 41; } { key = 44; } { foo = true; key = 45; } { foo = true; key = 49; } { key = 53; } { foo = true; key = 54; } { foo = true; key = 58; } { key = 62; } { foo = true; key = 67; } { key = 71; } { key = 80; } ] diff --git a/tests/lang/eval-okay-closure.out.xml b/tests/lang/eval-okay-closure.out.xml deleted file mode 100644 index dffc03a99..000000000 --- a/tests/lang/eval-okay-closure.out.xml +++ /dev/null @@ -1,343 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/lang/eval-okay-comments.out b/tests/lang/eval-okay-comments.out deleted file mode 100644 index 7182dc2f9..000000000 --- a/tests/lang/eval-okay-comments.out +++ /dev/null @@ -1 +0,0 @@ -"abcdefghijklmnopqrstuvwxyz" diff --git a/tests/lang/eval-okay-concat.out b/tests/lang/eval-okay-concat.out deleted file mode 100644 index bb4bbd577..000000000 --- a/tests/lang/eval-okay-concat.out +++ /dev/null @@ -1 +0,0 @@ -[ 1 2 3 4 5 6 7 8 9 ] diff --git a/tests/lang/eval-okay-concatmap.out b/tests/lang/eval-okay-concatmap.out deleted file mode 100644 index 3b8be7739..000000000 --- a/tests/lang/eval-okay-concatmap.out +++ /dev/null @@ -1 +0,0 @@ -[ [ 1 3 5 7 9 ] [ "a" "z" "b" "z" ] ] diff --git a/tests/lang/eval-okay-concatstringssep.out b/tests/lang/eval-okay-concatstringssep.out deleted file mode 100644 index 93987647f..000000000 --- a/tests/lang/eval-okay-concatstringssep.out +++ /dev/null @@ -1 +0,0 @@ -[ "" "foobarxyzzy" "foo, bar, xyzzy" "foo" "" ] diff --git a/tests/lang/eval-okay-context-introspection.out b/tests/lang/eval-okay-context-introspection.out deleted file mode 100644 index 03b400cc8..000000000 --- a/tests/lang/eval-okay-context-introspection.out +++ /dev/null @@ -1 +0,0 @@ -[ true true true true true true ] diff --git a/tests/lang/eval-okay-context.out b/tests/lang/eval-okay-context.out deleted file mode 100644 index 2f535bdbc..000000000 --- a/tests/lang/eval-okay-context.out +++ /dev/null @@ -1 +0,0 @@ -"foo eval-okay-context.nix bar" diff --git a/tests/lang/eval-okay-curpos.out b/tests/lang/eval-okay-curpos.out deleted file mode 100644 index 65fd65b4d..000000000 --- a/tests/lang/eval-okay-curpos.out +++ /dev/null @@ -1 +0,0 @@ -[ 3 7 4 9 ] diff --git a/tests/lang/eval-okay-deepseq.out b/tests/lang/eval-okay-deepseq.out deleted file mode 100644 index 8d38505c1..000000000 --- a/tests/lang/eval-okay-deepseq.out +++ /dev/null @@ -1 +0,0 @@ -456 diff --git a/tests/lang/eval-okay-delayed-with-inherit.out b/tests/lang/eval-okay-delayed-with-inherit.out deleted file mode 100644 index eaacb55c1..000000000 --- a/tests/lang/eval-okay-delayed-with-inherit.out +++ /dev/null @@ -1 +0,0 @@ -"b-overridden" diff --git a/tests/lang/eval-okay-delayed-with.out b/tests/lang/eval-okay-delayed-with.out deleted file mode 100644 index 8e7c61ab8..000000000 --- a/tests/lang/eval-okay-delayed-with.out +++ /dev/null @@ -1 +0,0 @@ -"b-overridden b-overridden a" diff --git a/tests/lang/eval-okay-dynamic-attrs-2.out b/tests/lang/eval-okay-dynamic-attrs-2.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-dynamic-attrs-2.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-dynamic-attrs-bare.out b/tests/lang/eval-okay-dynamic-attrs-bare.out deleted file mode 100644 index df8750afc..000000000 --- a/tests/lang/eval-okay-dynamic-attrs-bare.out +++ /dev/null @@ -1 +0,0 @@ -{ binds = true; hasAttrs = true; multiAttrs = true; recBinds = true; selectAttrs = true; selectOrAttrs = true; } diff --git a/tests/lang/eval-okay-dynamic-attrs.out b/tests/lang/eval-okay-dynamic-attrs.out deleted file mode 100644 index df8750afc..000000000 --- a/tests/lang/eval-okay-dynamic-attrs.out +++ /dev/null @@ -1 +0,0 @@ -{ binds = true; hasAttrs = true; multiAttrs = true; recBinds = true; selectAttrs = true; selectOrAttrs = true; } diff --git a/tests/lang/eval-okay-elem.out b/tests/lang/eval-okay-elem.out deleted file mode 100644 index 3cf6c0e96..000000000 --- a/tests/lang/eval-okay-elem.out +++ /dev/null @@ -1 +0,0 @@ -[ true false 30 ] diff --git a/tests/lang/eval-okay-empty-args.out b/tests/lang/eval-okay-empty-args.out deleted file mode 100644 index cb5537d5d..000000000 --- a/tests/lang/eval-okay-empty-args.out +++ /dev/null @@ -1 +0,0 @@ -"ab" diff --git a/tests/lang/eval-okay-eq-derivations.out b/tests/lang/eval-okay-eq-derivations.out deleted file mode 100644 index ec04aab6a..000000000 --- a/tests/lang/eval-okay-eq-derivations.out +++ /dev/null @@ -1 +0,0 @@ -[ true true true false ] diff --git a/tests/lang/eval-okay-eq.out b/tests/lang/eval-okay-eq.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-eq.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-filter.out b/tests/lang/eval-okay-filter.out deleted file mode 100644 index 355d51c27..000000000 --- a/tests/lang/eval-okay-filter.out +++ /dev/null @@ -1 +0,0 @@ -[ 0 2 4 6 8 10 100 102 104 106 108 110 ] diff --git a/tests/lang/eval-okay-flatten.out b/tests/lang/eval-okay-flatten.out deleted file mode 100644 index b979b2b8b..000000000 --- a/tests/lang/eval-okay-flatten.out +++ /dev/null @@ -1 +0,0 @@ -"1234567" diff --git a/tests/lang/eval-okay-float.out b/tests/lang/eval-okay-float.out deleted file mode 100644 index 3c50a8adc..000000000 --- a/tests/lang/eval-okay-float.out +++ /dev/null @@ -1 +0,0 @@ -[ 3.4 3.5 2.5 1.5 ] diff --git a/tests/lang/eval-okay-floor-ceil.out b/tests/lang/eval-okay-floor-ceil.out deleted file mode 100644 index 81f80420b..000000000 --- a/tests/lang/eval-okay-floor-ceil.out +++ /dev/null @@ -1 +0,0 @@ -"23;24;23;23" diff --git a/tests/lang/eval-okay-foldlStrict-lazy-elements.out b/tests/lang/eval-okay-foldlStrict-lazy-elements.out deleted file mode 100644 index d81cc0710..000000000 --- a/tests/lang/eval-okay-foldlStrict-lazy-elements.out +++ /dev/null @@ -1 +0,0 @@ -42 diff --git a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.out b/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.out deleted file mode 100644 index d81cc0710..000000000 --- a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.out +++ /dev/null @@ -1 +0,0 @@ -42 diff --git a/tests/lang/eval-okay-foldlStrict.out b/tests/lang/eval-okay-foldlStrict.out deleted file mode 100644 index 837e12b40..000000000 --- a/tests/lang/eval-okay-foldlStrict.out +++ /dev/null @@ -1 +0,0 @@ -500500 diff --git a/tests/lang/eval-okay-fromTOML.out b/tests/lang/eval-okay-fromTOML.out deleted file mode 100644 index d0dd3af2c..000000000 --- a/tests/lang/eval-okay-fromTOML.out +++ /dev/null @@ -1 +0,0 @@ -[ { clients = { data = [ [ "gamma" "delta" ] [ 1 2 ] ]; hosts = [ "alpha" "omega" ]; }; database = { connection_max = 5000; enabled = true; ports = [ 8001 8001 8002 ]; server = "192.168.1.1"; }; owner = { name = "Tom Preston-Werner"; }; servers = { alpha = { dc = "eqdc10"; ip = "10.0.0.1"; }; beta = { dc = "eqdc10"; ip = "10.0.0.2"; }; }; title = "TOML Example"; } { "1234" = "value"; "127.0.0.1" = "value"; a = { b = { c = { }; }; }; arr1 = [ 1 2 3 ]; arr2 = [ "red" "yellow" "green" ]; arr3 = [ [ 1 2 ] [ 3 4 5 ] ]; arr4 = [ "all" "strings" "are the same" "type" ]; arr5 = [ [ 1 2 ] [ "a" "b" "c" ] ]; arr7 = [ 1 2 3 ]; arr8 = [ 1 2 ]; bare-key = "value"; bare_key = "value"; bin1 = 214; bool1 = true; bool2 = false; "character encoding" = "value"; d = { e = { f = { }; }; }; dog = { "tater.man" = { type = { name = "pug"; }; }; }; flt1 = 1; flt2 = 3.1415; flt3 = -0.01; flt4 = 5e+22; flt5 = 1e+06; flt6 = -0.02; flt7 = 6.626e-34; flt8 = 9.22462e+06; fruit = [ { name = "apple"; physical = { color = "red"; shape = "round"; }; variety = [ { name = "red delicious"; } { name = "granny smith"; } ]; } { name = "banana"; variety = [ { name = "plantain"; } ]; } ]; g = { h = { i = { }; }; }; hex1 = 3735928559; hex2 = 3735928559; hex3 = 3735928559; int1 = 99; int2 = 42; int3 = 0; int4 = -17; int5 = 1000; int6 = 5349221; int7 = 12345; j = { "ʞ" = { l = { }; }; }; key = "value"; key2 = "value"; name = "Orange"; oct1 = 342391; oct2 = 493; physical = { color = "orange"; shape = "round"; }; products = [ { name = "Hammer"; sku = 738594937; } { } { color = "gray"; name = "Nail"; sku = 284758393; } ]; "quoted \"value\"" = "value"; site = { "google.com" = true; }; str = "I'm a string. \"You can quote me\". Name\tJosé\nLocation\tSF."; table-1 = { key1 = "some string"; key2 = 123; }; table-2 = { key1 = "another string"; key2 = 456; }; x = { y = { z = { w = { animal = { type = { name = "pug"; }; }; name = { first = "Tom"; last = "Preston-Werner"; }; point = { x = 1; y = 2; }; }; }; }; }; "ʎǝʞ" = "value"; } { metadata = { "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"; "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"; "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"; "checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef"; }; package = [ { dependencies = [ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" ]; name = "aho-corasick"; source = "registry+https://github.com/rust-lang/crates.io-index"; version = "0.6.4"; } { name = "ansi_term"; source = "registry+https://github.com/rust-lang/crates.io-index"; version = "0.9.0"; } { dependencies = [ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" ]; name = "atty"; source = "registry+https://github.com/rust-lang/crates.io-index"; version = "0.2.10"; } ]; } { a = [ [ { b = true; } ] ]; c = [ [ { d = true; } ] ]; e = [ [ 123 ] ]; } ] diff --git a/tests/lang/eval-okay-fromjson-escapes.out b/tests/lang/eval-okay-fromjson-escapes.out deleted file mode 100644 index add5505a8..000000000 --- a/tests/lang/eval-okay-fromjson-escapes.out +++ /dev/null @@ -1 +0,0 @@ -"quote \" reverse solidus \\ solidus / backspace  formfeed newline \n carriage return \r horizontal tab \t 1 char unicode encoded backspace  1 char unicode encoded e with accent é 2 char unicode encoded s with caron š 3 char unicode encoded rightwards arrow →" diff --git a/tests/lang/eval-okay-fromjson.out b/tests/lang/eval-okay-fromjson.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-fromjson.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-functionargs.out b/tests/lang/eval-okay-functionargs.out deleted file mode 100644 index c1c9f8ffa..000000000 --- a/tests/lang/eval-okay-functionargs.out +++ /dev/null @@ -1 +0,0 @@ -[ "stdenv" "fetchurl" "aterm-stdenv" "aterm-stdenv2" "libX11" "libXv" "mplayer-stdenv2.libXv-libX11" "mplayer-stdenv2.libXv-libX11_2" "nix-stdenv-aterm-stdenv" "nix-stdenv2-aterm2-stdenv2" ] diff --git a/tests/lang/eval-okay-functionargs.out.xml b/tests/lang/eval-okay-functionargs.out.xml deleted file mode 100644 index 651f54c36..000000000 --- a/tests/lang/eval-okay-functionargs.out.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tests/lang/eval-okay-getattrpos-functionargs.out b/tests/lang/eval-okay-getattrpos-functionargs.out deleted file mode 100644 index 7f9ac40e8..000000000 --- a/tests/lang/eval-okay-getattrpos-functionargs.out +++ /dev/null @@ -1 +0,0 @@ -{ column = 11; file = "eval-okay-getattrpos-functionargs.nix"; line = 2; } diff --git a/tests/lang/eval-okay-getattrpos-undefined.out b/tests/lang/eval-okay-getattrpos-undefined.out deleted file mode 100644 index 19765bd50..000000000 --- a/tests/lang/eval-okay-getattrpos-undefined.out +++ /dev/null @@ -1 +0,0 @@ -null diff --git a/tests/lang/eval-okay-getattrpos.out b/tests/lang/eval-okay-getattrpos.out deleted file mode 100644 index 469249bbc..000000000 --- a/tests/lang/eval-okay-getattrpos.out +++ /dev/null @@ -1 +0,0 @@ -{ column = 5; file = "eval-okay-getattrpos.nix"; line = 3; } diff --git a/tests/lang/eval-okay-getenv.out b/tests/lang/eval-okay-getenv.out deleted file mode 100644 index 14e24d419..000000000 --- a/tests/lang/eval-okay-getenv.out +++ /dev/null @@ -1 +0,0 @@ -"foobar" diff --git a/tests/lang/eval-okay-groupBy.out b/tests/lang/eval-okay-groupBy.out deleted file mode 100644 index bfca5652a..000000000 --- a/tests/lang/eval-okay-groupBy.out +++ /dev/null @@ -1 +0,0 @@ -{ "1" = [ 9 ]; "2" = [ 8 ]; "3" = [ 13 29 ]; "4" = [ 3 4 10 11 17 18 ]; "5" = [ 0 23 26 28 ]; "6" = [ 1 12 21 27 30 ]; "7" = [ 7 22 ]; "8" = [ 14 ]; "9" = [ 19 ]; b = [ 16 25 ]; c = [ 24 ]; d = [ 2 ]; e = [ 5 6 15 31 ]; f = [ 20 ]; } diff --git a/tests/lang/eval-okay-hashfile.out b/tests/lang/eval-okay-hashfile.out deleted file mode 100644 index ff1e8293e..000000000 --- a/tests/lang/eval-okay-hashfile.out +++ /dev/null @@ -1 +0,0 @@ -[ "d3b07384d113edec49eaa6238ad5ff00" "0f343b0931126a20f133d67c2b018a3b" "f1d2d2f924e986ac86fdf7b36c94bcdf32beec15" "60cacbf3d72e1e7834203da608037b1bf83b40e8" "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c" "5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef" "0cf9180a764aba863a67b6d72f0918bc131c6772642cb2dce5a34f0a702f9470ddc2bf125c12198b1995c233c34b4afd346c54a2334c350a948a51b6e8b4e6b6" "8efb4f73c5655351c444eb109230c556d39e2c7624e9c11abc9e3fb4b9b9254218cc5085b454a9698d085cfa92198491f07a723be4574adc70617b73eb0b6461" ] diff --git a/tests/lang/eval-okay-hashstring.out b/tests/lang/eval-okay-hashstring.out deleted file mode 100644 index d720a082d..000000000 --- a/tests/lang/eval-okay-hashstring.out +++ /dev/null @@ -1 +0,0 @@ -[ "d41d8cd98f00b204e9800998ecf8427e" "6c69ee7f211c640419d5366cc076ae46" "bb3438fbabd460ea6dbd27d153e2233b" "da39a3ee5e6b4b0d3255bfef95601890afd80709" "cd54e8568c1b37cf1e5badb0779bcbf382212189" "6d12e10b1d331dad210e47fd25d4f260802b7e77" "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" "900a4469df00ccbfd0c145c6d1e4b7953dd0afafadd7534e3a4019e8d38fc663" "ad0387b3bd8652f730ca46d25f9c170af0fd589f42e7f23f5a9e6412d97d7e56" "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" "9d0886f8c6b389398a16257bc79780fab9831c7fc11c8ab07fa732cb7b348feade382f92617c9c5305fefba0af02ab5fd39a587d330997ff5bd0db19f7666653" "21644b72aa259e5a588cd3afbafb1d4310f4889680f6c83b9d531596a5a284f34dbebff409d23bcc86aee6bad10c891606f075c6f4755cb536da27db5693f3a7" ] diff --git a/tests/lang/eval-okay-if.out b/tests/lang/eval-okay-if.out deleted file mode 100644 index 00750edc0..000000000 --- a/tests/lang/eval-okay-if.out +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/lang/eval-okay-import.out b/tests/lang/eval-okay-import.out deleted file mode 100644 index c508125b5..000000000 --- a/tests/lang/eval-okay-import.out +++ /dev/null @@ -1 +0,0 @@ -[ 1 2 3 4 5 6 7 8 9 10 ] diff --git a/tests/lang/eval-okay-ind-string.out b/tests/lang/eval-okay-ind-string.out deleted file mode 100644 index 7862331fa..000000000 --- a/tests/lang/eval-okay-ind-string.out +++ /dev/null @@ -1 +0,0 @@ -"This is an indented multi-line string\nliteral. An amount of whitespace at\nthe start of each line matching the minimum\nindentation of all lines in the string\nliteral together will be removed. Thus,\nin this case four spaces will be\nstripped from each line, even though\n THIS LINE is indented six spaces.\n\nAlso, empty lines don't count in the\ndetermination of the indentation level (the\nprevious empty line has indentation 0, but\nit doesn't matter).\nIf the string starts with whitespace\n followed by a newline, it's stripped, but\n that's not the case here. Two spaces are\n stripped because of the \" \" at the start. \nThis line is indented\na bit further.\nAnti-quotations, like so, are\nalso allowed.\n The \\ is not special here.\n' can be followed by any character except another ', e.g. 'x'.\nLikewise for $, e.g. $$ or $varName.\nBut ' followed by ' is special, as is $ followed by {.\nIf you want them, use anti-quotations: '', \${.\n Tabs are not interpreted as whitespace (since we can't guess\n what tab settings are intended), so don't use them.\n\tThis line starts with a space and a tab, so only one\n space will be stripped from each line.\nAlso note that if the last line (just before the closing ' ')\nconsists only of whitespace, it's ignored. But here there is\nsome non-whitespace stuff, so the line isn't removed. \nThis shows a hacky way to preserve an empty line after the start.\nBut there's no reason to do so: you could just repeat the empty\nline.\n Similarly you can force an indentation level,\n in this case to 2 spaces. This works because the anti-quote\n is significant (not whitespace).\nstart on network-interfaces\n\nstart script\n\n rm -f /var/run/opengl-driver\n ln -sf 123 /var/run/opengl-driver\n\n rm -f /var/log/slim.log\n \nend script\n\nenv SLIM_CFGFILE=abc\nenv SLIM_THEMESDIR=def\nenv FONTCONFIG_FILE=/etc/fonts/fonts.conf \t\t\t\t# !!! cleanup\nenv XKB_BINDIR=foo/bin \t\t\t\t# Needed for the Xkb extension.\nenv LD_LIBRARY_PATH=libX11/lib:libXext/lib:/usr/lib/ # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)\n\nenv XORG_DRI_DRIVER_PATH=nvidiaDrivers/X11R6/lib/modules/drivers/ \n\nexec slim/bin/slim\nEscaping of ' followed by ': ''\nEscaping of $ followed by {: \${\nAnd finally to interpret \\n etc. as in a string: \n, \r, \t.\nfoo\n'bla'\nbar\ncut -d $'\\t' -f 1\nending dollar $$\n" diff --git a/tests/lang/eval-okay-intersectAttrs.out b/tests/lang/eval-okay-intersectAttrs.out deleted file mode 100644 index 50445bc0e..000000000 --- a/tests/lang/eval-okay-intersectAttrs.out +++ /dev/null @@ -1 +0,0 @@ -[ { } { a = 1; } { a = 1; } { a = "a"; } { m = 1; } { m = "m"; } { n = 1; } { n = "n"; } { n = 1; p = 2; } { n = "n"; p = "p"; } { n = 1; p = 2; } { n = "n"; p = "p"; } { a = "a"; b = "b"; c = "c"; d = "d"; e = "e"; f = "f"; g = "g"; h = "h"; i = "i"; j = "j"; k = "k"; l = "l"; m = "m"; n = "n"; o = "o"; p = "p"; q = "q"; r = "r"; s = "s"; t = "t"; u = "u"; v = "v"; w = "w"; x = "x"; y = "y"; z = "z"; } true ] diff --git a/tests/lang/eval-okay-let.out b/tests/lang/eval-okay-let.out deleted file mode 100644 index 14e24d419..000000000 --- a/tests/lang/eval-okay-let.out +++ /dev/null @@ -1 +0,0 @@ -"foobar" diff --git a/tests/lang/eval-okay-list.out b/tests/lang/eval-okay-list.out deleted file mode 100644 index f784f26d8..000000000 --- a/tests/lang/eval-okay-list.out +++ /dev/null @@ -1 +0,0 @@ -"foobarblatest" diff --git a/tests/lang/eval-okay-listtoattrs.out b/tests/lang/eval-okay-listtoattrs.out deleted file mode 100644 index 74abef7bc..000000000 --- a/tests/lang/eval-okay-listtoattrs.out +++ /dev/null @@ -1 +0,0 @@ -"AAbar" diff --git a/tests/lang/eval-okay-logic.out b/tests/lang/eval-okay-logic.out deleted file mode 100644 index d00491fd7..000000000 --- a/tests/lang/eval-okay-logic.out +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/lang/eval-okay-map.out b/tests/lang/eval-okay-map.out deleted file mode 100644 index dbb64f717..000000000 --- a/tests/lang/eval-okay-map.out +++ /dev/null @@ -1 +0,0 @@ -"foobarblabarxyzzybar" diff --git a/tests/lang/eval-okay-mapattrs.out b/tests/lang/eval-okay-mapattrs.out deleted file mode 100644 index 3f113f17b..000000000 --- a/tests/lang/eval-okay-mapattrs.out +++ /dev/null @@ -1 +0,0 @@ -{ x = "x-foo"; y = "y-bar"; } diff --git a/tests/lang/eval-okay-nested-with.out b/tests/lang/eval-okay-nested-with.out deleted file mode 100644 index 0cfbf0888..000000000 --- a/tests/lang/eval-okay-nested-with.out +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/lang/eval-okay-new-let.out b/tests/lang/eval-okay-new-let.out deleted file mode 100644 index f98b38807..000000000 --- a/tests/lang/eval-okay-new-let.out +++ /dev/null @@ -1 +0,0 @@ -"xyzzyfoobar" diff --git a/tests/lang/eval-okay-null-dynamic-attrs.out b/tests/lang/eval-okay-null-dynamic-attrs.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-null-dynamic-attrs.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-overrides.out b/tests/lang/eval-okay-overrides.out deleted file mode 100644 index 0cfbf0888..000000000 --- a/tests/lang/eval-okay-overrides.out +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/lang/eval-okay-partition.out b/tests/lang/eval-okay-partition.out deleted file mode 100644 index cd8b8b020..000000000 --- a/tests/lang/eval-okay-partition.out +++ /dev/null @@ -1 +0,0 @@ -{ right = [ 0 2 4 6 8 10 100 102 104 106 108 110 ]; wrong = [ 1 3 5 7 9 101 103 105 107 109 ]; } diff --git a/tests/lang/eval-okay-path-antiquotation.out b/tests/lang/eval-okay-path-antiquotation.out deleted file mode 100644 index f7939e5de..000000000 --- a/tests/lang/eval-okay-path-antiquotation.out +++ /dev/null @@ -1 +0,0 @@ -{ absolute = /foo; expr = /home/bmc/sources/nix/tests/lang/foo/bar; home = /fake-home/foo; notfirst = /home/bmc/sources/nix/tests/lang/bar/foo; simple = /home/bmc/sources/nix/tests/lang/foo; slashes = /foo/bar; surrounded = /home/bmc/sources/nix/tests/lang/a-foo-b; } diff --git a/tests/lang/eval-okay-path.out b/tests/lang/eval-okay-path.out deleted file mode 100644 index 3ce7f8283..000000000 --- a/tests/lang/eval-okay-path.out +++ /dev/null @@ -1 +0,0 @@ -"/nix/store/ya937r4ydw0l6kayq8jkyqaips9c75jm-output" diff --git a/tests/lang/eval-okay-pathexists.out b/tests/lang/eval-okay-pathexists.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-pathexists.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-patterns.out b/tests/lang/eval-okay-patterns.out deleted file mode 100644 index a4304010f..000000000 --- a/tests/lang/eval-okay-patterns.out +++ /dev/null @@ -1 +0,0 @@ -"abcxyzDDDDEFijk" diff --git a/tests/lang/eval-okay-readDir.out b/tests/lang/eval-okay-readDir.out deleted file mode 100644 index 6413f6d4f..000000000 --- a/tests/lang/eval-okay-readDir.out +++ /dev/null @@ -1 +0,0 @@ -{ bar = "regular"; foo = "directory"; ldir = "symlink"; linked = "symlink"; } diff --git a/tests/lang/eval-okay-readFileType.out b/tests/lang/eval-okay-readFileType.out deleted file mode 100644 index 6413f6d4f..000000000 --- a/tests/lang/eval-okay-readFileType.out +++ /dev/null @@ -1 +0,0 @@ -{ bar = "regular"; foo = "directory"; ldir = "symlink"; linked = "symlink"; } diff --git a/tests/lang/eval-okay-readfile.out b/tests/lang/eval-okay-readfile.out deleted file mode 100644 index a2c87d0c4..000000000 --- a/tests/lang/eval-okay-readfile.out +++ /dev/null @@ -1 +0,0 @@ -"builtins.readFile ./eval-okay-readfile.nix\n" diff --git a/tests/lang/eval-okay-redefine-builtin.out b/tests/lang/eval-okay-redefine-builtin.out deleted file mode 100644 index c508d5366..000000000 --- a/tests/lang/eval-okay-redefine-builtin.out +++ /dev/null @@ -1 +0,0 @@ -false diff --git a/tests/lang/eval-okay-regex-match.out b/tests/lang/eval-okay-regex-match.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-regex-match.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-regex-split.out b/tests/lang/eval-okay-regex-split.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-regex-split.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-regression-20220122.out b/tests/lang/eval-okay-regression-20220122.out deleted file mode 100644 index 00750edc0..000000000 --- a/tests/lang/eval-okay-regression-20220122.out +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/lang/eval-okay-regression-20220125.out b/tests/lang/eval-okay-regression-20220125.out deleted file mode 100644 index 00750edc0..000000000 --- a/tests/lang/eval-okay-regression-20220125.out +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/lang/eval-okay-remove.out b/tests/lang/eval-okay-remove.out deleted file mode 100644 index 8d38505c1..000000000 --- a/tests/lang/eval-okay-remove.out +++ /dev/null @@ -1 +0,0 @@ -456 diff --git a/tests/lang/eval-okay-replacestrings.out b/tests/lang/eval-okay-replacestrings.out deleted file mode 100644 index 72e8274d8..000000000 --- a/tests/lang/eval-okay-replacestrings.out +++ /dev/null @@ -1 +0,0 @@ -[ "faabar" "fbar" "fubar" "faboor" "fubar" "XaXbXcX" "X" "a_b" ] diff --git a/tests/lang/eval-okay-scope-1.out b/tests/lang/eval-okay-scope-1.out deleted file mode 100644 index 00750edc0..000000000 --- a/tests/lang/eval-okay-scope-1.out +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/lang/eval-okay-scope-2.out b/tests/lang/eval-okay-scope-2.out deleted file mode 100644 index d00491fd7..000000000 --- a/tests/lang/eval-okay-scope-2.out +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/lang/eval-okay-scope-3.out b/tests/lang/eval-okay-scope-3.out deleted file mode 100644 index b8626c4cf..000000000 --- a/tests/lang/eval-okay-scope-3.out +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/tests/lang/eval-okay-scope-4.out b/tests/lang/eval-okay-scope-4.out deleted file mode 100644 index 00ff03a46..000000000 --- a/tests/lang/eval-okay-scope-4.out +++ /dev/null @@ -1 +0,0 @@ -"ccdd" diff --git a/tests/lang/eval-okay-scope-6.out b/tests/lang/eval-okay-scope-6.out deleted file mode 100644 index 00ff03a46..000000000 --- a/tests/lang/eval-okay-scope-6.out +++ /dev/null @@ -1 +0,0 @@ -"ccdd" diff --git a/tests/lang/eval-okay-scope-7.out b/tests/lang/eval-okay-scope-7.out deleted file mode 100644 index d00491fd7..000000000 --- a/tests/lang/eval-okay-scope-7.out +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/lang/eval-okay-search-path.out b/tests/lang/eval-okay-search-path.out deleted file mode 100644 index 4519bc406..000000000 --- a/tests/lang/eval-okay-search-path.out +++ /dev/null @@ -1 +0,0 @@ -"abccX" diff --git a/tests/lang/eval-okay-seq.out b/tests/lang/eval-okay-seq.out deleted file mode 100644 index 0cfbf0888..000000000 --- a/tests/lang/eval-okay-seq.out +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/lang/eval-okay-sort.out b/tests/lang/eval-okay-sort.out deleted file mode 100644 index 899119e20..000000000 --- a/tests/lang/eval-okay-sort.out +++ /dev/null @@ -1 +0,0 @@ -[ [ 42 77 147 249 483 526 ] [ 526 483 249 147 77 42 ] [ "bar" "fnord" "foo" "xyzzy" ] [ { key = 1; value = "foo"; } { key = 1; value = "fnord"; } { key = 2; value = "bar"; } ] [ [ ] [ ] [ 1 ] [ 1 4 ] [ 1 5 ] [ 1 6 ] [ 2 ] [ 2 3 ] [ 3 ] [ 3 ] ] ] diff --git a/tests/lang/eval-okay-splitversion.out b/tests/lang/eval-okay-splitversion.out deleted file mode 100644 index 153ceb818..000000000 --- a/tests/lang/eval-okay-splitversion.out +++ /dev/null @@ -1 +0,0 @@ -[ "1" "2" "3" ] diff --git a/tests/lang/eval-okay-string.out b/tests/lang/eval-okay-string.out deleted file mode 100644 index 63f650f73..000000000 --- a/tests/lang/eval-okay-string.out +++ /dev/null @@ -1 +0,0 @@ -"foobar/a/b/c/d/foo/xyzzy/foo.txt/../foo/x/yescape: \"quote\" \n \\end\nof\nlinefoobarblaatfoo$bar$\"$\"$" diff --git a/tests/lang/eval-okay-strings-as-attrs-names.out b/tests/lang/eval-okay-strings-as-attrs-names.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-strings-as-attrs-names.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-substring.out b/tests/lang/eval-okay-substring.out deleted file mode 100644 index 6aace04b0..000000000 --- a/tests/lang/eval-okay-substring.out +++ /dev/null @@ -1 +0,0 @@ -"ooxfoobarybarzobaabbc" diff --git a/tests/lang/eval-okay-tojson.out b/tests/lang/eval-okay-tojson.out deleted file mode 100644 index e92aae323..000000000 --- a/tests/lang/eval-okay-tojson.out +++ /dev/null @@ -1 +0,0 @@ -"{\"a\":123,\"b\":-456,\"c\":\"foo\",\"d\":\"foo\\n\\\"bar\\\"\",\"e\":true,\"f\":false,\"g\":[1,2,3],\"h\":[\"a\",[\"b\",{\"foo\\nbar\":{}}]],\"i\":3,\"j\":1.44,\"k\":\"foo\"}" diff --git a/tests/lang/eval-okay-toxml.out b/tests/lang/eval-okay-toxml.out deleted file mode 100644 index 828220890..000000000 --- a/tests/lang/eval-okay-toxml.out +++ /dev/null @@ -1 +0,0 @@ -"\n\n \n \n \n \n \n\n" diff --git a/tests/lang/eval-okay-toxml2.out b/tests/lang/eval-okay-toxml2.out deleted file mode 100644 index 634a841eb..000000000 --- a/tests/lang/eval-okay-toxml2.out +++ /dev/null @@ -1 +0,0 @@ -"\n\n \n \n \n \n \n \n \n \n \n \n \n \n\n" diff --git a/tests/lang/eval-okay-tryeval.out b/tests/lang/eval-okay-tryeval.out deleted file mode 100644 index 2b2e6fa71..000000000 --- a/tests/lang/eval-okay-tryeval.out +++ /dev/null @@ -1 +0,0 @@ -{ x = { success = true; value = "x"; }; y = { success = false; value = false; }; z = { success = false; value = false; }; } diff --git a/tests/lang/eval-okay-types.out b/tests/lang/eval-okay-types.out deleted file mode 100644 index 92a153299..000000000 --- a/tests/lang/eval-okay-types.out +++ /dev/null @@ -1 +0,0 @@ -[ true false true false true false true false true true true true true true true true true true true false true true true false "int" "bool" "string" "null" "set" "list" "lambda" "lambda" "lambda" "lambda" ] diff --git a/tests/lang/eval-okay-versions.out b/tests/lang/eval-okay-versions.out deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-versions.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-with.out b/tests/lang/eval-okay-with.out deleted file mode 100644 index 378c8dc80..000000000 --- a/tests/lang/eval-okay-with.out +++ /dev/null @@ -1 +0,0 @@ -"xyzzybarxyzzybar" diff --git a/tests/lang/eval-okay-xml.out.xml b/tests/lang/eval-okay-xml.out.xml deleted file mode 100644 index 20099326c..000000000 --- a/tests/lang/eval-okay-xml.out.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/lang/eval-okay-zipAttrsWith.out b/tests/lang/eval-okay-zipAttrsWith.out deleted file mode 100644 index 9c0b15d22..000000000 --- a/tests/lang/eval-okay-zipAttrsWith.out +++ /dev/null @@ -1 +0,0 @@ -{ "0" = { n = "0"; v = [ 5 23 29 ]; }; "1" = { n = "1"; v = [ 7 30 ]; }; "2" = { n = "2"; v = [ 18 ]; }; "4" = { n = "4"; v = [ 10 ]; }; "5" = { n = "5"; v = [ 15 25 26 31 ]; }; "6" = { n = "6"; v = [ 3 14 ]; }; "7" = { n = "7"; v = [ 12 ]; }; "8" = { n = "8"; v = [ 2 6 8 9 ]; }; "9" = { n = "9"; v = [ 0 16 ]; }; a = { n = "a"; v = [ 17 21 22 27 ]; }; c = { n = "c"; v = [ 11 24 ]; }; d = { n = "d"; v = [ 4 13 28 ]; }; e = { n = "e"; v = [ 20 ]; }; f = { n = "f"; v = [ 1 19 ]; }; } diff --git a/tests/lang/parse-okay-1.out b/tests/lang/parse-okay-1.out deleted file mode 100644 index d5ab5f18a..000000000 --- a/tests/lang/parse-okay-1.out +++ /dev/null @@ -1 +0,0 @@ -({ x, y, z }: ((x + y) + z)) diff --git a/tests/lang/parse-okay-crlf.out b/tests/lang/parse-okay-crlf.out deleted file mode 100644 index 4213609fc..000000000 --- a/tests/lang/parse-okay-crlf.out +++ /dev/null @@ -1 +0,0 @@ -rec { foo = "multi\nline\n string\n test\r"; x = y; y = 123; z = 456; } diff --git a/tests/lang/parse-okay-dup-attrs-5.out b/tests/lang/parse-okay-dup-attrs-5.out deleted file mode 100644 index 88b0b036f..000000000 --- a/tests/lang/parse-okay-dup-attrs-5.out +++ /dev/null @@ -1 +0,0 @@ -{ services = { ssh = { enable = true; port = 23; }; }; } diff --git a/tests/lang/parse-okay-dup-attrs-6.out b/tests/lang/parse-okay-dup-attrs-6.out deleted file mode 100644 index 88b0b036f..000000000 --- a/tests/lang/parse-okay-dup-attrs-6.out +++ /dev/null @@ -1 +0,0 @@ -{ services = { ssh = { enable = true; port = 23; }; }; } diff --git a/tests/lang/parse-okay-mixed-nested-attrs-1.out b/tests/lang/parse-okay-mixed-nested-attrs-1.out deleted file mode 100644 index 89c66f760..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-1.out +++ /dev/null @@ -1 +0,0 @@ -{ x = { q = 3; y = 3; z = 3; }; } diff --git a/tests/lang/parse-okay-mixed-nested-attrs-2.out b/tests/lang/parse-okay-mixed-nested-attrs-2.out deleted file mode 100644 index 89c66f760..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-2.out +++ /dev/null @@ -1 +0,0 @@ -{ x = { q = 3; y = 3; z = 3; }; } diff --git a/tests/lang/parse-okay-mixed-nested-attrs-3.out b/tests/lang/parse-okay-mixed-nested-attrs-3.out deleted file mode 100644 index b89a59734..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-3.out +++ /dev/null @@ -1 +0,0 @@ -{ services = { httpd = { enable = true; }; ssh = { enable = true; port = 123; }; }; } diff --git a/tests/lang/parse-okay-regression-20041027.out b/tests/lang/parse-okay-regression-20041027.out deleted file mode 100644 index 9df7219e4..000000000 --- a/tests/lang/parse-okay-regression-20041027.out +++ /dev/null @@ -1 +0,0 @@ -({ fetchurl, stdenv }: ((stdenv).mkDerivation { name = "libXi-6.0.1"; src = (fetchurl { md5 = "7e935a42428d63a387b3c048be0f2756"; url = "http://freedesktop.org/~xlibs/release/libXi-6.0.1.tar.bz2"; }); })) diff --git a/tests/lang/parse-okay-regression-751.out b/tests/lang/parse-okay-regression-751.out deleted file mode 100644 index e2ed886fe..000000000 --- a/tests/lang/parse-okay-regression-751.out +++ /dev/null @@ -1 +0,0 @@ -(let const = (a: "const"); in ((const { x = "q"; }))) diff --git a/tests/lang/parse-okay-subversion.out b/tests/lang/parse-okay-subversion.out deleted file mode 100644 index 4168ee8bf..000000000 --- a/tests/lang/parse-okay-subversion.out +++ /dev/null @@ -1 +0,0 @@ -({ fetchurl, localServer ? false, httpServer ? false, sslSupport ? false, pythonBindings ? false, javaSwigBindings ? false, javahlBindings ? false, stdenv, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null }: assert (expat != null); assert (localServer -> (db4 != null)); assert (httpServer -> ((httpd != null) && ((httpd).expat == expat))); assert (sslSupport -> ((openssl != null) && (httpServer -> ((httpd).openssl == openssl)))); assert (pythonBindings -> ((swig != null) && (swig).pythonSupport)); assert (javaSwigBindings -> ((swig != null) && (swig).javaSupport)); assert (javahlBindings -> (j2sdk != null)); ((stdenv).mkDerivation { builder = /foo/bar; db4 = (if localServer then db4 else null); inherit expat ; inherit httpServer ; httpd = (if httpServer then httpd else null); j2sdk = (if javaSwigBindings then (swig).j2sdk else (if javahlBindings then j2sdk else null)); inherit javaSwigBindings ; inherit javahlBindings ; inherit localServer ; name = "subversion-1.1.1"; openssl = (if sslSupport then openssl else null); patches = (if javahlBindings then [ (/javahl.patch) ] else [ ]); python = (if pythonBindings then (swig).python else null); inherit pythonBindings ; src = (fetchurl { md5 = "a180c3fe91680389c210c99def54d9e0"; url = "http://subversion.tigris.org/tarballs/subversion-1.1.1.tar.bz2"; }); inherit sslSupport ; swig = (if (pythonBindings || javaSwigBindings) then swig else null); })) diff --git a/tests/lang/parse-okay-url.out b/tests/lang/parse-okay-url.out deleted file mode 100644 index e5f0829b0..000000000 --- a/tests/lang/parse-okay-url.out +++ /dev/null @@ -1 +0,0 @@ -[ ("x:x") ("https://svn.cs.uu.nl:12443/repos/trace/trunk") ("http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2") ("http://losser.st-lab.cs.uu.nl/~armijn/.nix/gcc-3.3.4-static-nix.tar.gz") ("http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/install_flash_player_7_linux.tar.gz") ("https://ftp5.gwdg.de/pub/linux/archlinux/extra/os/x86_64/unzip-6.0-14-x86_64.pkg.tar.zst") ("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz") ] diff --git a/tests/unit/libexpr/libnixexpr-tests b/tests/unit/libexpr/libnixexpr-tests deleted file mode 100755 index fa9043f29..000000000 Binary files a/tests/unit/libexpr/libnixexpr-tests and /dev/null differ diff --git a/tests/unit/libfetchers/libnixfetchers-tests b/tests/unit/libfetchers/libnixfetchers-tests deleted file mode 100755 index 49efe48df..000000000 Binary files a/tests/unit/libfetchers/libnixfetchers-tests and /dev/null differ diff --git a/tests/unit/libflake/libnixflake-tests b/tests/unit/libflake/libnixflake-tests deleted file mode 100755 index c157d3b3c..000000000 Binary files a/tests/unit/libflake/libnixflake-tests and /dev/null differ diff --git a/tests/unit/libstore/libnixstore-tests b/tests/unit/libstore/libnixstore-tests deleted file mode 100755 index 6297e6be5..000000000 Binary files a/tests/unit/libstore/libnixstore-tests and /dev/null differ diff --git a/tests/unit/libutil/libnixutil-tests b/tests/unit/libutil/libnixutil-tests deleted file mode 100755 index 538a34533..000000000 Binary files a/tests/unit/libutil/libnixutil-tests and /dev/null differ