1 files changed, 24 insertions, 16 deletions
diff --git a/tvix/eval/src/tests/mod.rs b/tvix/eval/src/tests/mod.rs
index c51acfab976f..ca8c114ba320 100644
--- a/tvix/eval/src/tests/mod.rs
+++ b/tvix/eval/src/tests/mod.rs
@@ -2,6 +2,25 @@ use crate::eval::interpret;
 
 use test_generator::test_resources;
 
+fn eval_okay_test(code_path: &str) {
+    let base = code_path
+        .strip_suffix("nix")
+        .expect("test files always end in .nix");
+    let exp_path = format!("{}exp", base);
+
+    let code = std::fs::read_to_string(code_path).expect("should be able to read test code");
+    let exp = std::fs::read_to_string(exp_path).expect("should be able to read test expectation");
+
+    let result = interpret(&code).expect("evaluation of eval-okay test should succeed");
+    let result_str = format!("{}", result);
+
+    assert_eq!(
+        exp.trim(),
+        result_str,
+        "result value representation (right) must match expectation (left)"
+    );
+}
+
 // identity-* tests contain Nix code snippets which should evaluate to
 // themselves exactly (i.e. literals).
 #[test_resources("src/tests/tvix_tests/identity-*.nix")]
@@ -23,25 +42,14 @@ fn identity(code_path: &str) {
 //
 // These evaluations are always supposed to succeed, i.e. all snippets
 // are guaranteed to be valid Nix code.
+#[test_resources("src/tests/tvix_tests/eval-okay-*.nix")]
+fn eval_okay(code_path: &str) {
+    eval_okay_test(code_path)
+}
 
 // eval-okay-* tests from the original Nix test suite.
 #[cfg(feature = "nix_tests")]
 #[test_resources("src/tests/nix_tests/eval-okay-*.nix")]
 fn nix_eval_okay(code_path: &str) {
-    let base = code_path
-        .strip_suffix("nix")
-        .expect("test files always end in .nix");
-    let exp_path = format!("{}exp", base);
-
-    let code = std::fs::read_to_string(code_path).expect("should be able to read test code");
-    let exp = std::fs::read_to_string(exp_path).expect("should be able to read test expectation");
-
-    let result = interpret(&code).expect("evaluation of eval-okay test should succeed");
-    let result_str = format!("{}", result);
-
-    assert_eq!(
-        exp.trim(),
-        result_str,
-        "result value representation (right) must match expectation (left)"
-    );
+    eval_okay_test(code_path)
 }