From 8e517bc8d04da60f1851aa44000ad7400817e522 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 23 Jan 2024 15:04:48 +0200 Subject: fix(tvix/eval/tests): fix eval-okay-getenv This relies on TEST_VAR=foo being set to "foo". Nix does this in tests/functional/lang.sh, we do it in the test suite. Change-Id: I7ffa9ed27124530b7758aeadf07c79477656f34f Reviewed-on: https://cl.tvl.fyi/c/depot/+/10683 Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/eval/src/tests/mod.rs | 2 ++ tvix/eval/src/tests/nix_tests/eval-okay-getenv.exp | 1 + tvix/eval/src/tests/nix_tests/eval-okay-getenv.nix | 1 + tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.exp | 1 - tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.nix | 1 - 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tvix/eval/src/tests/nix_tests/eval-okay-getenv.exp create mode 100644 tvix/eval/src/tests/nix_tests/eval-okay-getenv.nix delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.exp delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.nix (limited to 'tvix/eval/src') diff --git a/tvix/eval/src/tests/mod.rs b/tvix/eval/src/tests/mod.rs index c80368970e..856707119b 100644 --- a/tvix/eval/src/tests/mod.rs +++ b/tvix/eval/src/tests/mod.rs @@ -40,6 +40,8 @@ mod mock_builtins { } fn eval_test(code_path: PathBuf, expect_success: bool) { + std::env::set_var("TEST_VAR", "foo"); // for eval-okay-getenv.nix + eprintln!("path: {}", code_path.display()); assert_eq!( code_path.extension().unwrap(), diff --git a/tvix/eval/src/tests/nix_tests/eval-okay-getenv.exp b/tvix/eval/src/tests/nix_tests/eval-okay-getenv.exp new file mode 100644 index 0000000000..14e24d4190 --- /dev/null +++ b/tvix/eval/src/tests/nix_tests/eval-okay-getenv.exp @@ -0,0 +1 @@ +"foobar" diff --git a/tvix/eval/src/tests/nix_tests/eval-okay-getenv.nix b/tvix/eval/src/tests/nix_tests/eval-okay-getenv.nix new file mode 100644 index 0000000000..4cfec5f553 --- /dev/null +++ b/tvix/eval/src/tests/nix_tests/eval-okay-getenv.nix @@ -0,0 +1 @@ +builtins.getEnv "TEST_VAR" + (if builtins.getEnv "NO_SUCH_VAR" == "" then "bar" else "bla") diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.exp b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.exp deleted file mode 100644 index 14e24d4190..0000000000 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.exp +++ /dev/null @@ -1 +0,0 @@ -"foobar" diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.nix b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.nix deleted file mode 100644 index 4cfec5f553..0000000000 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-getenv.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.getEnv "TEST_VAR" + (if builtins.getEnv "NO_SUCH_VAR" == "" then "bar" else "bla") -- cgit 1.4.1