feat: use directives for test auxiliary

Author: Wybxc

bootstrap/Cargo.lock

@@ -10,5 +10,6 @@ color-print = "0.3.6"
 env_logger = "0.11.5"
 glob = "0.3.1"
 log = "0.4.22"
+regex = "1.11.1"
 similar = "2.6.0"
 which = "6.0.1"

bootstrap/Cargo.toml

@@ -1,5 +1,5 @@
 use std::fs::File;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use anstream::{eprint as print, eprintln as println};
 use clap::Args;
@@ -65,24 +65,15 @@ impl Run for TestCommand {
 
 impl TestCommand {
     pub fn collect_testcases(&self, manifest: &Manifest) -> Vec<TestCase> {
-        let mut result = vec![];
-
-        // Test auxiliary (should compile first)
-        for case in glob("tests/auxiliary/*.rs").unwrap() {
-            let case = case.unwrap();
-            let filename = case.file_stem().unwrap();
-            let name = format!("auxiliary/{}", filename.to_string_lossy());
-            let output_file = manifest.out_dir.join(filename);
-            result.push(TestCase { name, source: case, output_file, test: TestType::CompileLib })
-        }
+        let mut tests = vec![];
 
         // Examples
         for case in glob("examples/*.rs").unwrap() {
             let case = case.unwrap();
             let filename = case.file_stem().unwrap();
             let name = format!("examples/{}", filename.to_string_lossy());
             let output_file = manifest.out_dir.join("examples").join(filename);
-            result.push(TestCase { name, source: case, output_file, test: TestType::Compile })
+            tests.push(TestCase { name, source: case, output_file, test: TestType::Compile })
         }
 
         // Codegen tests
@@ -91,7 +82,7 @@ impl TestCommand {
             let filename = case.file_stem().unwrap();
             let name = format!("codegen/{}", filename.to_string_lossy());
             let output_file = manifest.out_dir.join("tests/codegen").join(filename);
-            result.push(TestCase { name, source: case, output_file, test: TestType::FileCheck })
+            tests.push(TestCase { name, source: case, output_file, test: TestType::FileCheck })
         }
 
         // Bless tests - the output should be the same as the last run
@@ -100,10 +91,28 @@ impl TestCommand {
             let filename = case.file_stem().unwrap();
             let name = format!("bless/{}", filename.to_string_lossy());
             let output_file = manifest.out_dir.join("tests/bless").join(filename);
-            result.push(TestCase { name, source: case, output_file, test: TestType::Bless })
+            tests.push(TestCase { name, source: case, output_file, test: TestType::Bless })
+        }
+
+        // Collect test-auxiliary
+        let aux_use = regex::Regex::new(r"^//@\s*aux-build:(?P<fname>.*)").unwrap();
+        let mut auxiliary = vec![];
+        for case in tests.iter() {
+            let source = std::fs::read_to_string(&case.source).unwrap();
+            for cap in aux_use.captures_iter(&source) {
+                let fname = cap.name("fname").unwrap().as_str();
+                let source = Path::new("tests/auxiliary").join(fname);
+                let filename = source.file_stem().unwrap();
+                let name = format!("auxiliary/{}", filename.to_string_lossy());
+                let output_file = manifest.out_dir.join(filename); // aux files are output to the base directory
+                auxiliary.push(TestCase { name, source, output_file, test: TestType::CompileLib })
+            }
         }
 
-        result
+        // Compile auxiliary before the tests
+        let mut cases = auxiliary;
+        cases.extend(tests);
+        cases
     }
 }
 

bootstrap/src/test.rs

@@ -1,3 +1,5 @@
+//@ aux-build:mini_core.rs
+
 #![feature(no_core)]
 #![no_core]
 #![no_main]

examples/basic_math.rs

@@ -1,5 +1,7 @@
 //! Test that the generated code has the filename and function name in it
 
+//@ aux-build:mini_core.rs
+
 // CHECK: filename
 
 #![feature(no_core)]

tests/codegen/filename.rs

@@ -1,5 +1,7 @@
 //! Test that the generated code has the right number of parameters
 
+//@ aux-build:mini_core.rs
+
 #![feature(no_core)]
 #![no_core]
 #![no_main]

tests/codegen/params_count.rs

@@ -1,4 +1,7 @@
 //! Test that we can return a value from a function
+
+//@ aux-build:mini_core.rs
+
 #![feature(no_core)]
 #![no_core]
 #![no_main]