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 7b9531cfe9..0000000000
--- 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 4519bc406d..4519bc406d 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 a28e682100..a28e682100 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 92b75e0b8b..92b75e0b8b 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 2f535bdbc4..0000000000
--- 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 815f51b1d6..815f51b1d6 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 7a8391786a..7a8391786a 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 27ba77ddaf..27ba77ddaf 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 43178bd2ee..d11aad38c7 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 0000000000..f8088f9e17
--- /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 0000000000..90f82abe1c
--- /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 828220890e..828220890e 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 068c97a6c1..068c97a6c1 100644
--- a/third_party/nix/src/tests/lang/disabled/eval-okay-toxml.nix
+++ b/third_party/nix/src/tests/lang/evalstore-okay-toxml.nix