From ee0b89c4029fe027174018c14dcf7fcff342c8bf Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 21 Sep 2022 16:25:16 +0200 Subject: test(tvix/eval): test word behavior in builtins.compareVersions We delegate to Rust std's Ord trait, so we should at least do a sanity check here. Change-Id: I9596068f8ab3e51b79602de0bac79af6d558086e Reviewed-on: https://cl.tvl.fyi/c/depot/+/6723 Tested-by: BuildkiteCI Reviewed-by: tazjin --- .../eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.exp | 2 +- .../eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'tvix') diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.exp index cec7889224..e69498c3e1 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.exp +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.exp @@ -1 +1 @@ -[ 0 -1 -1 0 0 0 1 1 -1 1 -1 1 -1 -1 -1 -1 0 -1 -1 0 1 1 1 1 -1 -1 -1 -1 -1 ] +[ 0 -1 -1 0 0 0 1 1 -1 1 -1 1 -1 -1 -1 -1 0 1 -1 -1 1 -1 -1 0 1 1 1 1 -1 -1 -1 -1 -1 ] diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.nix index 32b959df04..cce554b449 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.nix +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.nix @@ -25,6 +25,11 @@ in (cmp "2.3" "2.3prepre") (cmp "2.3pre" "2.3prepre") (cmp "2.3prepre" "2.3prepre") + # check that the plain word comparison (via Ord) behaves the same + (cmp "foo" "bar") + (cmp "FoO" "fOo") + (cmp "foo" "fooo") + (cmp "foopre" "foo") # Subset of test cases from eval-okay-versions.nix shipped by C++ Nix (cmp "1.0" "2.3") (cmp "2.1" "2.3") -- cgit 1.4.1