From 7b1632ec71cc56dffa6eeca90fdf122331a5065f Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Sun, 14 Jan 2024 04:07:33 +0100 Subject: feat(tvix/eval): strengthen significantly catchable test suite Adds a bunch (notably certain overlapping) tests for catchable situations. This should cover many scenarios, argument is catchable, element in argument is catchable, function returns catchable in the middle of the processing, etc. Co-authored-by: Aspen Smith Change-Id: Icd722cf8dbc91a24f45cd540a328711e5826f76c Reviewed-on: https://cl.tvl.fyi/c/depot/+/10621 Reviewed-by: aspen Tested-by: BuildkiteCI --- tvix/verify-lang-tests/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tvix/verify-lang-tests/default.nix') diff --git a/tvix/verify-lang-tests/default.nix b/tvix/verify-lang-tests/default.nix index a6c494569f..276a57f129 100644 --- a/tvix/verify-lang-tests/default.nix +++ b/tvix/verify-lang-tests/default.nix @@ -51,6 +51,7 @@ let "eval-okay-floor.nix" = [ nix ]; "eval-okay-groupBy.nix" = [ nix ]; "eval-okay-zipAttrsWith.nix" = [ nix ]; + "eval-okay-builtins-group-by-propagate-catchable.nix" = [ nix ]; # Comparable lists are not in Nix 2.3 "eval-okay-sort.nix" = [ nix ]; "eval-okay-compare-lists.nix" = [ nix ]; @@ -75,6 +76,12 @@ let # b72bc4a972fe568744d98b89d63adcd504cb586c "eval-okay-identifier-formatting.nix" = [ nix ]; + # Different catchable behavior between nix 2.3 and 2.18 + "eval-okay-builtins-map-propagate-catchable.nix" = [ nix_latest ]; + "eval-okay-builtins-gen-list-propagate-catchable.nix" = [ nix_latest ]; + "eval-okay-builtins-replace-strings-propagate-catchable.nix" = + [ nix_latest ]; + # TODO(sterni): support diffing working directory and home relative paths # like C++ Nix test suite (using string replacement). "eval-okay-path-antiquotation.nix" = true; -- cgit 1.4.1