From 7ea249969a0c76af4a9375cb61ad7e9e6ea816f4 Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 21 Sep 2022 13:42:05 +0200 Subject: test(tvix/eval): add more compareVersions test cases involving pre This asserts the not-quite lexicographical property of the comparison. Change-Id: Iad68081e4b3a7106513f479643de87065dc47739 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6721 Tested-by: BuildkiteCI Reviewed-by: tazjin --- .../src/tests/tvix_tests/eval-okay-builtins-compareVersions.exp | 2 +- .../src/tests/tvix_tests/eval-okay-builtins-compareVersions.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'tvix/eval/src') 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 0ec1768e2cba..cec788922439 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 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 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 dd3c8a0ac123..32b959df0453 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 @@ -19,6 +19,12 @@ in (cmp "1a.b" "1a.2") (cmp "1" "") (cmp "1.0" "1.0.0") + (cmp "2.3" "2.3pre") + (cmp "2.3" "2.3.0pre") + (cmp "2.3pre" "2.3.0pre") + (cmp "2.3" "2.3prepre") + (cmp "2.3pre" "2.3prepre") + (cmp "2.3prepre" "2.3prepre") # 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