feat(tvix): Re-enable language tests that needed a store r/1673

Now that we have access to a store in tests, we can enable the tests that needed a store.

Additionally, move the expected output files for disabled tests into the disabled folder.

Change-Id: I2492d49d43b93c7c9b0463e4d3d2855a5a51365d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1758
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>

13 files changed, 8 insertions, 8 deletions

diff --git a/third_party/nix/src/tests/lang/disabled/eval-okay-context.nix b/third_party/nix/src/tests/lang/disabled/eval-okay-context.nix
deleted file mode 100644
index 7b9531cfe9e1..000000000000
--- a/third_party/nix/src/tests/lang/disabled/eval-okay-context.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-let s = "foo ${builtins.substring 33 100 (baseNameOf "${./eval-okay-context.nix}")} bar";
-in
-  if s != "foo eval-okay-context.nix bar"
-  then abort "context not discarded"
-  else builtins.unsafeDiscardStringContext s
-
diff --git a/third_party/nix/src/tests/lang/eval-okay-search-path.exp b/third_party/nix/src/tests/lang/disabled/eval-okay-search-path.exp
index 4519bc406db5..4519bc406db5 100644
--- a/third_party/nix/src/tests/lang/eval-okay-search-path.exp
+++ b/third_party/nix/src/tests/lang/disabled/eval-okay-search-path.exp
diff --git a/third_party/nix/src/tests/lang/eval-okay-search-path.flags b/third_party/nix/src/tests/lang/disabled/eval-okay-search-path.flags
index a28e6821004a..a28e6821004a 100644
--- a/third_party/nix/src/tests/lang/eval-okay-search-path.flags
+++ b/third_party/nix/src/tests/lang/disabled/eval-okay-search-path.flags
diff --git a/third_party/nix/src/tests/lang/eval-okay-xml.exp b/third_party/nix/src/tests/lang/disabled/eval-okay-xml.exp
index 92b75e0b8b17..92b75e0b8b17 100644
--- a/third_party/nix/src/tests/lang/eval-okay-xml.exp
+++ b/third_party/nix/src/tests/lang/disabled/eval-okay-xml.exp
diff --git a/third_party/nix/src/tests/lang/eval-okay-context.exp b/third_party/nix/src/tests/lang/eval-okay-context.exp
deleted file mode 100644
index 2f535bdbc454..000000000000
--- a/third_party/nix/src/tests/lang/eval-okay-context.exp
+++ /dev/null
@@ -1 +0,0 @@
-"foo eval-okay-context.nix bar"
diff --git a/third_party/nix/src/tests/lang/disabled/eval-okay-autoargs.nix b/third_party/nix/src/tests/lang/evalargs-okay-autoargs.nix
index 815f51b1d67a..815f51b1d67a 100644
--- a/third_party/nix/src/tests/lang/disabled/eval-okay-autoargs.nix
+++ b/third_party/nix/src/tests/lang/evalargs-okay-autoargs.nix
diff --git a/third_party/nix/src/tests/lang/disabled/eval-okay-autoargs.exp b/third_party/nix/src/tests/lang/evalstore-okay-autoargs.exp
index 7a8391786a09..7a8391786a09 100644
--- a/third_party/nix/src/tests/lang/disabled/eval-okay-autoargs.exp
+++ b/third_party/nix/src/tests/lang/evalstore-okay-autoargs.exp
diff --git a/third_party/nix/src/tests/lang/eval-okay-context-introspection.exp b/third_party/nix/src/tests/lang/evalstore-okay-context-introspection.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/src/tests/lang/eval-okay-context-introspection.exp
+++ b/third_party/nix/src/tests/lang/evalstore-okay-context-introspection.exp
diff --git a/third_party/nix/src/tests/lang/disabled/eval-okay-context-introspection.nix b/third_party/nix/src/tests/lang/evalstore-okay-context-introspection.nix
index 43178bd2eef9..d11aad38c726 100644
--- a/third_party/nix/src/tests/lang/disabled/eval-okay-context-introspection.nix
+++ b/third_party/nix/src/tests/lang/evalstore-okay-context-introspection.nix
@@ -6,7 +6,7 @@ let
     outputs = [ "out" "foo" ];
   };
 
-  path = "${./eval-okay-context-introspection.nix}";
+  path = "${./evalstore-okay-context-introspection.nix}";
 
   desired-context = {
     "${builtins.unsafeDiscardStringContext path}" = {
diff --git a/third_party/nix/src/tests/lang/evalstore-okay-context.exp b/third_party/nix/src/tests/lang/evalstore-okay-context.exp
new file mode 100644
index 000000000000..f8088f9e172a
--- /dev/null
+++ b/third_party/nix/src/tests/lang/evalstore-okay-context.exp
@@ -0,0 +1 @@
+"foo evalstore-okay-context.nix bar"
diff --git a/third_party/nix/src/tests/lang/evalstore-okay-context.nix b/third_party/nix/src/tests/lang/evalstore-okay-context.nix
new file mode 100644
index 000000000000..90f82abe1c36
--- /dev/null
+++ b/third_party/nix/src/tests/lang/evalstore-okay-context.nix
@@ -0,0 +1,6 @@
+let s = "foo ${builtins.substring 33 100 (baseNameOf "${./evalstore-okay-context.nix}")} bar";
+in
+  if s != "foo evalstore-okay-context.nix bar"
+  then abort "context not discarded"
+  else builtins.unsafeDiscardStringContext s
+
diff --git a/third_party/nix/src/tests/lang/eval-okay-toxml.exp b/third_party/nix/src/tests/lang/evalstore-okay-toxml.exp
index 828220890ecd..828220890ecd 100644
--- a/third_party/nix/src/tests/lang/eval-okay-toxml.exp
+++ b/third_party/nix/src/tests/lang/evalstore-okay-toxml.exp
diff --git a/third_party/nix/src/tests/lang/disabled/eval-okay-toxml.nix b/third_party/nix/src/tests/lang/evalstore-okay-toxml.nix
index 068c97a6c1b3..068c97a6c1b3 100644
--- a/third_party/nix/src/tests/lang/disabled/eval-okay-toxml.nix
+++ b/third_party/nix/src/tests/lang/evalstore-okay-toxml.nix