From f358be4a1d44eb989c8a1eb293b1233cf653911e Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 19 Sep 2022 10:36:54 +0200 Subject: fix(tvix/eval): move compareVersions test so cargo test finds them And insert the missing newline the C++ Nix test script needs. Change-Id: I04ddd7268f9caa1414fd23314c281bb7c1e854cf Reviewed-on: https://cl.tvl.fyi/c/depot/+/6689 Reviewed-by: tazjin Autosubmit: sterni Tested-by: BuildkiteCI --- tvix/eval/eval-okay-builtins-compareVersions.exp | 1 - tvix/eval/eval-okay-builtins-compareVersions.nix | 12 ------------ .../tests/tvix_tests/eval-okay-builtins-compareVersions.exp | 1 + .../tests/tvix_tests/eval-okay-builtins-compareVersions.nix | 12 ++++++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 tvix/eval/eval-okay-builtins-compareVersions.exp delete mode 100644 tvix/eval/eval-okay-builtins-compareVersions.nix create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.nix (limited to 'tvix') diff --git a/tvix/eval/eval-okay-builtins-compareVersions.exp b/tvix/eval/eval-okay-builtins-compareVersions.exp deleted file mode 100644 index b4d1452f4d..0000000000 --- a/tvix/eval/eval-okay-builtins-compareVersions.exp +++ /dev/null @@ -1 +0,0 @@ -[ 0 -1 -1 0 0 0 1 1 -1 1 ] \ No newline at end of file diff --git a/tvix/eval/eval-okay-builtins-compareVersions.nix b/tvix/eval/eval-okay-builtins-compareVersions.nix deleted file mode 100644 index 769de79ad5..0000000000 --- a/tvix/eval/eval-okay-builtins-compareVersions.nix +++ /dev/null @@ -1,12 +0,0 @@ -[ - (builtins.compareVersions "1.2.3" "1.2.3") - (builtins.compareVersions "1.2.2" "1.2.3") - (builtins.compareVersions "1.2.3" "1.2.40") - (builtins.compareVersions "1.2.3" ".1.2.3") - (builtins.compareVersions "1.2.3" "1..2.3") - (builtins.compareVersions "1.2.3" "1.2.3.") - (builtins.compareVersions "1.2.3" "1.2") - (builtins.compareVersions "1.2.3" "1.2.a") - (builtins.compareVersions "1a.b" "1a.2") - (builtins.compareVersions "1" "") -] 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 new file mode 100644 index 0000000000..d959994103 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.exp @@ -0,0 +1 @@ +[ 0 -1 -1 0 0 0 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 new file mode 100644 index 0000000000..769de79ad5 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-compareVersions.nix @@ -0,0 +1,12 @@ +[ + (builtins.compareVersions "1.2.3" "1.2.3") + (builtins.compareVersions "1.2.2" "1.2.3") + (builtins.compareVersions "1.2.3" "1.2.40") + (builtins.compareVersions "1.2.3" ".1.2.3") + (builtins.compareVersions "1.2.3" "1..2.3") + (builtins.compareVersions "1.2.3" "1.2.3.") + (builtins.compareVersions "1.2.3" "1.2") + (builtins.compareVersions "1.2.3" "1.2.a") + (builtins.compareVersions "1a.b" "1a.2") + (builtins.compareVersions "1" "") +] -- cgit 1.4.1