tests work

Author: bindsdev

Makefile

@@ -53,9 +53,9 @@ ovmf:
 
 kernel_build:
 	@cargo build $(CARGO_ARGS)
-
+	
 kernel_test:
-	@cargo test $(CARGO_ARGS)
+	@cargo rustc $(CARGO_ARGS) -- --test
 
 $(ISO): gen_build_dirs limine ovmf 	
 	@cp target/x86_64-unknown-none/$(PROFILE)/monoos $(KERNEL_BIN)
@@ -70,8 +70,7 @@ 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)	
+	@qemu-system-x86_64 $(QEMU_ARGS) -display none	
 
 miri:
 	@MIRI_NO_STD=1 cargo miri run --target x86_64-unknown-none

src/tests.rs

@@ -5,9 +5,9 @@ pub struct Test {
 }
 
 pub fn test_runner(tests: &[&Test]) {
-    log::info!("running {} tests", tests.len());
+    log::info!("running {} test(s)", tests.len());
 
-    let mut successful = 0;
+    let mut passed = 0;
     let mut suppressed = 0;
 
     for test in tests {
@@ -18,20 +18,13 @@ pub fn test_runner(tests: &[&Test]) {
         } else {
             suppressed += 1;
         }
+
+        passed += 1;
     }
 
-    log::info!("");
     log::info!(
-        "tests completed. {} successful; {} suppressed",
-        successful,
+        "tests completed: {} passed; {} suppressed",
+        passed,
         suppressed
     );
 }
-
-#[cfg(test)]
-mod tests {
-    #[mono_proc::test]
-    fn testtest() {
-        assert!(true);
-    }
-}