From b4d978cd6aeeac25897dc86b437fd2e96827626f Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 8 Oct 2022 13:48:08 -0400 Subject: feat(tvix/tests): Import default.nix inside directory This requires actually passing the source directory into `interpret` in the eval tests, but otherwise this is fairly straightforward - if we're trying to import a directory, just push `default.nix` onto it and import that instead. Change-Id: I0b7d4234f81977e78d14dfa651bf0cf9721017e5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6893 Autosubmit: grfn Reviewed-by: sterni Tested-by: BuildkiteCI --- tvix/eval/src/tests/tvix_tests/directory/default.nix | 1 + tvix/eval/src/tests/tvix_tests/eval-okay-import.exp | 1 + tvix/eval/src/tests/tvix_tests/eval-okay-import.nix | 4 ++++ 3 files changed, 6 insertions(+) create mode 100644 tvix/eval/src/tests/tvix_tests/directory/default.nix create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-import.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-import.nix (limited to 'tvix/eval/src/tests/tvix_tests') diff --git a/tvix/eval/src/tests/tvix_tests/directory/default.nix b/tvix/eval/src/tests/tvix_tests/directory/default.nix new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/directory/default.nix @@ -0,0 +1 @@ +42 diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-import.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-import.exp new file mode 100644 index 0000000000..5ba7f64d78 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-import.exp @@ -0,0 +1 @@ +[ 42 42 ] diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-import.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-import.nix new file mode 100644 index 0000000000..49cd244f06 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-import.nix @@ -0,0 +1,4 @@ +[ + (import ./directory) + (import ./directory/default.nix) +] -- cgit 1.4.1