From 3b8c9ec9c871c50855bb6fe78859ff25590b616b Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 14 Jun 2023 17:36:10 +0200 Subject: test(tvix/eval): update nix_tests suite to C++ Nix master Adds new tests for foldl', intersectAttrs as well as fills in missing .exp files. New test cases we don't pass: - fromTOML timestamp capabilities - path antiquotation - replaceStrings is lazier on C++ Nix master The C++ Nix revision used is 7066d21a0ddb421967980094222c4bc1f5a0f45a. Change-Id: Ic619c96e2d41e6c5ea6fa93f9402b12e564af3c5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8778 Reviewed-by: tazjin Autosubmit: sterni Tested-by: BuildkiteCI --- tvix/verify-lang-tests/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tvix/verify-lang-tests') diff --git a/tvix/verify-lang-tests/default.nix b/tvix/verify-lang-tests/default.nix index 7e70b6230673..54fa0f908cba 100644 --- a/tvix/verify-lang-tests/default.nix +++ b/tvix/verify-lang-tests/default.nix @@ -36,6 +36,8 @@ let ] ) [ "nix_tests" "nix_tests/notyetpassing" "tvix_tests" "tvix_tests/notyetpassing" ]; + latestNixIs215 = lib.versionOlder nix_latest.version "2.16"; + skippedLangTests = { # TODO(sterni): set up NIX_PATH in sandbox "eval-okay-search-path.nix" = true; @@ -64,6 +66,16 @@ let "eval-okay-import-display.nix" = [ nix ]; # Cycle detection and formatting changed sometime after Nix 2.3 "eval-okay-cycle-display-cpp-nix-2.13.nix" = [ nix ]; + # builtins.replaceStrings becomes lazier in Nix 2.16 + "eval-okay-replacestrings.nix" = [ nix (assert latestNixIs215; nix_latest) ]; + # builtins.readFileType is added in Nix 2.15 + "eval-okay-readFileType.nix" = [ nix ]; + # builtins.fromTOML gains support for timestamps in Nix 2.16 + "eval-okay-fromTOML-timestamps.nix" = [ nix (assert latestNixIs215; 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; }; runCppNixLangTests = cpp-nix: -- cgit 1.4.1