about summary refs log tree commit diff
path: root/tvix/eval/src
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-10-19T17·19+0200
committersterni <sternenseemann@systemli.org>2022-10-20T08·40+0000
commitbbf1e3273751a294bdff7329fae022bce4963b66 (patch)
treedebf5f09383f59255a0ff4ef43ae518357da19d3 /tvix/eval/src
parentd9dfe659105dbca51cf1284c92d8956f9851d253 (diff)
fix(tvix/eval): restore .exp.xml files and skip in test suite r/5168
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
Diffstat (limited to 'tvix/eval/src')
-rw-r--r--tvix/eval/src/tests/mod.rs7
-rw-r--r--tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp.xml (renamed from tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp)0
-rw-r--r--tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml (renamed from tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp)0
3 files changed, 7 insertions, 0 deletions
diff --git a/tvix/eval/src/tests/mod.rs b/tvix/eval/src/tests/mod.rs
index 8a58b3cc7973..798cc7b87b6e 100644
--- a/tvix/eval/src/tests/mod.rs
+++ b/tvix/eval/src/tests/mod.rs
@@ -9,9 +9,16 @@ fn eval_test(code_path: &str, expect_success: bool) {
         .strip_suffix("nix")
         .expect("test files always end in .nix");
     let exp_path = format!("{}exp", base);
+    let exp_xml_path = std::path::PathBuf::from(format!("{}exp.xml", base));
 
     let code = std::fs::read_to_string(code_path).expect("should be able to read test code");
 
+    if exp_xml_path.exists() {
+        // We can't test them at the moment because we don't have XML output yet.
+        // Checking for success / failure only is a bit disingenious.
+        return;
+    }
+
     match interpret(&code, Some(code_path.into()), Options::test_options()) {
         Ok(result) => {
             let result_str = format!("{}", result);
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.xml
index 651f54c36341..651f54c36341 100644
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp
+++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-functionargs.exp.xml
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.xml
index 20099326cc96..20099326cc96 100644
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp
+++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml