test macro

Author: bindsdev

Cargo.lock

@@ -1,3 +1,6 @@
+[workspace]
+members = ["mono-proc"]
+
 [package]
 name = "monoOS"
 version = "0.1.0"
@@ -6,11 +9,13 @@ description = "A hobbyist monolithic operating system, targeting x86-64."
 readme = "README.md"
 license = "MIT"
 authors = ["binds <[email protected]>"]
+default-run = "monoos"
 
 [dependencies]
 complete-pic = { version = "0.3.1", default-features = false, features = ["8259pic"] }
 limine = "0.1.11"
 log = "0.4.19"
+mono-proc = { version = "0.1.0", path = "mono-proc" }
 spin = { version = "0.9.8", default-features = false, features = ["spin_mutex", "once", "lazy"] }
 uart_16550 = "0.3.0"
 x86_64 = "0.14.10"

Cargo.toml

@@ -37,7 +37,7 @@ override ESP        := $(BUILD_ROOT)/EFI/BOOT
 override KERNEL_BIN := $(BUILD_ROOT)/monoos.elf
 
 # Targets
-.PHONY: all iso run miri clean
+.PHONY: all iso run test miri clean
 all: iso
 
 gen_build_dirs:
@@ -54,7 +54,10 @@ ovmf:
 kernel_build:
 	@cargo build $(CARGO_ARGS)
 
-$(ISO): gen_build_dirs limine ovmf kernel_build
+kernel_test:
+	@cargo test $(CARGO_ARGS)
+
+$(ISO): gen_build_dirs limine ovmf 	
 	@cp target/x86_64-unknown-none/$(PROFILE)/monoos $(KERNEL_BIN)
 	@cp limine.cfg $(LIMINE_DIR)/limine-uefi-cd.bin $(BUILD_ROOT)
 	@cp $(LIMINE_DIR)/BOOTX64.EFI $(ESP)
@@ -63,7 +66,11 @@ $(ISO): gen_build_dirs limine ovmf kernel_build
 # Convenience target for $(ISO)
 iso: $(ISO)
 
-run: iso
+run: kernel_build iso
+	@qemu-system-x86_64 $(QEMU_ARGS)	
+
+test: kernel_test iso
+	override QEMU_ARGS += -display none	
 	@qemu-system-x86_64 $(QEMU_ARGS)	
 
 miri:

Makefile

@@ -0,0 +1,13 @@
+[package]
+name = "mono-proc"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro-error = "1.0.4"
+proc-macro2 = "1.0.66"
+quote = "1.0.33"
+syn = { version = "2.0.29", features = ["full"] }

mono-proc/Cargo.lock

@@ -0,0 +1,31 @@
+use proc_macro::TokenStream;
+use proc_macro_error::proc_macro_error;
+use syn::ItemFn;
+
+/// Attribute that tests are marked with.
+#[proc_macro_error]
+#[proc_macro_attribute]
+pub fn test(attr: TokenStream, item: TokenStream) -> TokenStream {
+    let attr = attr.to_string();
+    let quiet = if attr.contains("quiet") { true } else { false };
+
+    let input = syn::parse_macro_input!(item as ItemFn);
+    let name = &input.sig.ident;
+    let body = &input.block;
+
+    let test_marker = quote::format_ident!("{name}_test_marker");
+    let result = quote::quote! {
+        #[test_case]
+        static #test_marker: crate::tests::Test = crate::tests::Test {
+            path: concat!(module_path!(), "::", stringify!(#name)),
+            func: #name,
+            quiet: #quiet
+        };
+
+        fn #name() {
+            #body
+        }
+    };
+
+    result.into()
+}

mono-proc/Cargo.toml

@@ -21,6 +21,8 @@ mod cpu;
 mod drivers;
 mod logger;
 mod mem;
+
+#[cfg(test)]
 mod tests;
 
 use core::{panic::PanicInfo, sync::atomic::Ordering};
@@ -65,6 +67,9 @@ extern "C" fn kmain() -> ! {
     // drivers::graphics::init(framebuffer);
     // log::info!("initialized graphics driver");
 
+    #[cfg(test)]
+    test_main();
+
     hlt()
 }
 

mono-proc/src/lib.rs

@@ -1,5 +1,5 @@
 pub struct Test {
-    pub name: &'static str,
+    pub path: &'static str,
     pub func: fn(),
     pub quiet: bool,
 }
@@ -14,16 +14,24 @@ pub fn test_runner(tests: &[&Test]) {
         (test.func)();
 
         if !test.quiet {
-            log::info!("test {} ... ok", test.name);
+            log::info!("test {} ... ok", test.path);
         } else {
             suppressed += 1;
         }
     }
 
     log::info!("");
     log::info!(
-        "tests completed. {} successful;  {} suppressed",
+        "tests completed. {} successful; {} suppressed",
         successful,
         suppressed
     );
 }
+
+#[cfg(test)]
+mod tests {
+    #[mono_proc::test]
+    fn testtest() {
+        assert!(true);
+    }
+}