From 8e188d623591871944c5d8626921747333454e9e Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 19 Oct 2022 16:36:28 +0200 Subject: test(tvix/eval): update C++ Nix test suite to current master The language test suite actually doesn't require flakes and the new features are mostly sensible (added builtins) as well as some tests for regressions the C++ implementation experienced. The path interpolation test is not included in this update because there is no way to construct an location-independent .exp file for it (the C++ repo also doesn't have one). We may still want to implement that feature eventually (in case rnix adds support for it). The C++ Nix revision used is ac0fb38e8a5a25a84fa17704bd31b453211263eb. Change-Id: I75f1e780ddeeee6f6b1f28cf3c66c288dca2c20c Reviewed-on: https://cl.tvl.fyi/c/depot/+/7043 Autosubmit: sterni Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/verify-lang-tests/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tvix/verify-lang-tests') diff --git a/tvix/verify-lang-tests/default.nix b/tvix/verify-lang-tests/default.nix index 41282488d4e3..2f013d6cb45b 100644 --- a/tvix/verify-lang-tests/default.nix +++ b/tvix/verify-lang-tests/default.nix @@ -44,7 +44,15 @@ let # C++ Nix can't do TCO "nix_tests/eval-okay-tail-call-1.nix" = true; # Ordering change after 2.3 - "nix_tests/eval-okay-xml.nix" = [ nix_latest ]; + "nix_tests/eval-okay-xml.nix" = [ nix ]; + # Missing builtins in Nix 2.3 + "nix_tests/eval-okay-floor-ceil.nix" = [ nix ]; + "nix_tests/eval-okay-groupBy.nix" = [ nix ]; + "nix_tests/eval-okay-zipAttrsWith.nix" = [ nix ]; + # Comparable lists are not in Nix 2.3 + "nix_tests/eval-okay-sort.nix" = [ nix ]; + # getAttrPos gains support for functionArgs-returned sets after 2.3 + "nix_tests/eval-okay-getattrpos-functionargs.nix" = [ nix ]; }; runCppNixLangTests = cpp-nix: -- cgit 1.4.1