From d9dfe659105dbca51cf1284c92d8956f9851d253 Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 19 Oct 2022 18:55:13 +0200 Subject: fix(tvix/eval): fix path in notyetpassing tests cl/7036 moved these paths around, but neglected to update the relative paths they contain. Without these updated, they will never start passing! Change-Id: Ib16468611af59729883e501be8486f43d850fd58 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7046 Autosubmit: sterni Tested-by: BuildkiteCI Reviewed-by: tazjin --- .../nix_tests/notyetpassing/eval-okay-closure.exp | 343 --------------------- .../notyetpassing/eval-okay-closure.exp.xml | 343 +++++++++++++++++++++ .../nix_tests/notyetpassing/eval-okay-closure.nix | 2 +- .../nix_tests/notyetpassing/eval-okay-hashfile.nix | 2 +- .../nix_tests/notyetpassing/eval-okay-import.nix | 4 +- 5 files changed, 347 insertions(+), 347 deletions(-) delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.exp create mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.exp.xml diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.exp b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.exp deleted file mode 100644 index dffc03a99891..000000000000 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.exp +++ /dev/null @@ -1,343 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.exp.xml b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.exp.xml new file mode 100644 index 000000000000..dffc03a99891 --- /dev/null +++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.exp.xml @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.nix b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.nix index cccd4dc35730..ab4aa0e49eb6 100644 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.nix +++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-closure.nix @@ -8,6 +8,6 @@ let else [{key = builtins.sub key 9;} {key = builtins.sub key 13; foo = true;}]; }; - sort = (import ./lib.nix).sortBy (a: b: builtins.lessThan a.key b.key); + sort = (import ./../lib.nix).sortBy (a: b: builtins.lessThan a.key b.key); in sort closure diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-hashfile.nix b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-hashfile.nix index aff5a1856814..8c9de66b7ecf 100644 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-hashfile.nix +++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-hashfile.nix @@ -1,4 +1,4 @@ let - paths = [ ./data ./binary-data ]; + paths = [ ./../data ./../binary-data ]; in builtins.concatLists (map (hash: map (builtins.hashFile hash) paths) ["md5" "sha1" "sha256" "sha512"]) diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-import.nix b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-import.nix index 0b18d9413122..76213a9541e3 100644 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-import.nix +++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-import.nix @@ -6,6 +6,6 @@ let scopedImport = attrs: fn: scopedImport (overrides // attrs) fn; builtins = builtins // overrides; - } // import ./lib.nix; + } // import ./../lib.nix; -in scopedImport overrides ./imported.nix +in scopedImport overrides ./../imported.nix -- cgit 1.4.1