From 60363039ef8a3a93a4e776955f6606a1ec08a438 Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 19 Oct 2022 18:50:43 +0200 Subject: test(tvix/eval): eval-okay-eq.nix can actually be tested eval-okay-eq.nix is actually an ancient test case that used the ATerm syntax for the test result. It was disabled for a while, since the behavior got reverted for a bit, but works on any reasonably modern Nix implementation. This change matches my [C++ Nix PR]. [C++ Nix PR]: https://github.com/NixOS/nix/pull/7196 Change-Id: I602fd7c83a0bc104ab502c8b6a74e4591272be1a Reviewed-on: https://cl.tvl.fyi/c/depot/+/7045 Autosubmit: sterni Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/eval/src/tests/nix_tests/eval-okay-eq.exp | 1 + tvix/eval/src/tests/nix_tests/eval-okay-eq.nix | 3 +++ tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.exp | 1 - tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.nix | 3 --- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 tvix/eval/src/tests/nix_tests/eval-okay-eq.exp create mode 100644 tvix/eval/src/tests/nix_tests/eval-okay-eq.nix delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.exp delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.nix (limited to 'tvix/eval') diff --git a/tvix/eval/src/tests/nix_tests/eval-okay-eq.exp b/tvix/eval/src/tests/nix_tests/eval-okay-eq.exp new file mode 100644 index 000000000000..27ba77ddaf61 --- /dev/null +++ b/tvix/eval/src/tests/nix_tests/eval-okay-eq.exp @@ -0,0 +1 @@ +true diff --git a/tvix/eval/src/tests/nix_tests/eval-okay-eq.nix b/tvix/eval/src/tests/nix_tests/eval-okay-eq.nix new file mode 100644 index 000000000000..73d200b38141 --- /dev/null +++ b/tvix/eval/src/tests/nix_tests/eval-okay-eq.nix @@ -0,0 +1,3 @@ +["foobar" (rec {x = 1; y = x;})] +== +[("foo" + "bar") ({x = 1; y = 1;})] diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.exp b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.exp deleted file mode 100644 index 2015847b65e7..000000000000 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.exp +++ /dev/null @@ -1 +0,0 @@ -Bool(True) diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.nix b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.nix deleted file mode 100644 index 73d200b38141..000000000000 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-eq.nix +++ /dev/null @@ -1,3 +0,0 @@ -["foobar" (rec {x = 1; y = x;})] -== -[("foo" + "bar") ({x = 1; y = 1;})] -- cgit 1.4.1