From bbf1e3273751a294bdff7329fae022bce4963b66 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Wed, 19 Oct 2022 19:19:03 +0200
Subject: fix(tvix/eval): restore .exp.xml files and skip in test suite

Change-Id: Iebda5e0d99925a0a8c1d6ae1d7a35397d127bf31
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7047
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
---
 .../notyetpassing/eval-okay-functionargs.exp       | 15 -------
 .../notyetpassing/eval-okay-functionargs.exp.xml   | 15 +++++++
 .../nix_tests/notyetpassing/eval-okay-xml.exp      | 52 ----------------------
 .../nix_tests/notyetpassing/eval-okay-xml.exp.xml  | 52 ++++++++++++++++++++++
 4 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp
 create mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp.xml
 delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp
 create mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml

(limited to 'tvix/eval/src/tests/nix_tests')

diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp
deleted file mode 100644
index 651f54c36341..000000000000
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <list>
-    <string value="stdenv" />
-    <string value="fetchurl" />
-    <string value="aterm-stdenv" />
-    <string value="aterm-stdenv2" />
-    <string value="libX11" />
-    <string value="libXv" />
-    <string value="mplayer-stdenv2.libXv-libX11" />
-    <string value="mplayer-stdenv2.libXv-libX11_2" />
-    <string value="nix-stdenv-aterm-stdenv" />
-    <string value="nix-stdenv2-aterm2-stdenv2" />
-  </list>
-</expr>
diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp.xml b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp.xml
new file mode 100644
index 000000000000..651f54c36341
--- /dev/null
+++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8'?>
+<expr>
+  <list>
+    <string value="stdenv" />
+    <string value="fetchurl" />
+    <string value="aterm-stdenv" />
+    <string value="aterm-stdenv2" />
+    <string value="libX11" />
+    <string value="libXv" />
+    <string value="mplayer-stdenv2.libXv-libX11" />
+    <string value="mplayer-stdenv2.libXv-libX11_2" />
+    <string value="nix-stdenv-aterm-stdenv" />
+    <string value="nix-stdenv2-aterm2-stdenv2" />
+  </list>
+</expr>
diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp
deleted file mode 100644
index 20099326cc96..000000000000
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <attrs>
-    <attr name="a">
-      <string value="foo" />
-    </attr>
-    <attr name="at">
-      <function>
-        <attrspat name="args">
-          <attr name="x" />
-          <attr name="y" />
-          <attr name="z" />
-        </attrspat>
-      </function>
-    </attr>
-    <attr name="b">
-      <string value="bar" />
-    </attr>
-    <attr name="c">
-      <string value="foobar" />
-    </attr>
-    <attr name="ellipsis">
-      <function>
-        <attrspat ellipsis="1">
-          <attr name="x" />
-          <attr name="y" />
-          <attr name="z" />
-        </attrspat>
-      </function>
-    </attr>
-    <attr name="f">
-      <function>
-        <attrspat>
-          <attr name="x" />
-          <attr name="y" />
-          <attr name="z" />
-        </attrspat>
-      </function>
-    </attr>
-    <attr name="id">
-      <function>
-        <varpat name="x" />
-      </function>
-    </attr>
-    <attr name="x">
-      <int value="123" />
-    </attr>
-    <attr name="y">
-      <float value="567.89" />
-    </attr>
-  </attrs>
-</expr>
diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml
new file mode 100644
index 000000000000..20099326cc96
--- /dev/null
+++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='utf-8'?>
+<expr>
+  <attrs>
+    <attr name="a">
+      <string value="foo" />
+    </attr>
+    <attr name="at">
+      <function>
+        <attrspat name="args">
+          <attr name="x" />
+          <attr name="y" />
+          <attr name="z" />
+        </attrspat>
+      </function>
+    </attr>
+    <attr name="b">
+      <string value="bar" />
+    </attr>
+    <attr name="c">
+      <string value="foobar" />
+    </attr>
+    <attr name="ellipsis">
+      <function>
+        <attrspat ellipsis="1">
+          <attr name="x" />
+          <attr name="y" />
+          <attr name="z" />
+        </attrspat>
+      </function>
+    </attr>
+    <attr name="f">
+      <function>
+        <attrspat>
+          <attr name="x" />
+          <attr name="y" />
+          <attr name="z" />
+        </attrspat>
+      </function>
+    </attr>
+    <attr name="id">
+      <function>
+        <varpat name="x" />
+      </function>
+    </attr>
+    <attr name="x">
+      <int value="123" />
+    </attr>
+    <attr name="y">
+      <float value="567.89" />
+    </attr>
+  </attrs>
+</expr>
-- 
cgit 1.4.1