aero_test: merge into aero_proc

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

src/Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["aero_kernel", "aero_syscall", "aero_test"]
+members = ["aero_kernel", "aero_syscall", "aero_proc"]
 
 [profile.release]
 debug = true

src/Cargo.toml

@@ -53,8 +53,5 @@ path = "../aero_syscall"
 [dependencies.cpio_reader]
 git = "https://github.com/czapek1337/cpio_reader"
 
-[dev-dependencies.aero_test]
-path = "../aero_test/"
-
 [build-dependencies]
 nasm-rs = { version = "0.2", features = ["parallel"] }

src/aero_kernel/Cargo.toml

@@ -117,7 +117,7 @@ pub fn get_raw_cmdline() -> &'static str {
 mod tests {
     use super::*;
 
-    #[aero_test::test]
+    #[aero_proc::test]
     fn number_parser_test() {
         assert_eq!(parse_number("0xdeadbeef").unwrap(), 0xdeadbeef);
         assert_eq!(parse_number("0o546").unwrap(), 0o546);

src/aero_kernel/src/cmdline.rs

@@ -564,13 +564,13 @@ pub fn is_aligned(addr: u64, align: u64) -> bool {
 mod tests {
     use super::*;
 
-    #[aero_test::test]
+    #[aero_proc::test]
     pub fn test_is_aligned() {
         assert!(is_aligned(0x1000, 0x1000));
         assert!(!is_aligned(69, 0x1000));
     }
 
-    #[aero_test::test]
+    #[aero_proc::test]
     pub fn test_align_up() {
         // align 1
         assert_eq!(align_up(0, 1), 0);

src/aero_kernel/src/mem/paging/addr.rs

@@ -577,7 +577,7 @@ mod tests {
 
     use crate::mem::AddressSpace;
 
-    #[aero_test::test]
+    #[aero_proc::test]
     fn vm_frame_ref_count() {
         let mut address_space = AddressSpace::this();
         let mut offset_table = address_space.offset_page_table();

src/aero_kernel/src/mem/paging/frame.rs

@@ -437,7 +437,7 @@ impl<S: PageSize> fmt::Debug for PhysFrameRangeInclusive<S> {
 mod tests {
     use super::*;
 
-    #[aero_test::test]
+    #[aero_proc::test]
     pub fn test_page_ranges() {
         let page_size = Size4KiB::SIZE;
         let number = 1000;

src/aero_kernel/src/mem/paging/page.rs

@@ -106,7 +106,7 @@ impl<S: AsRef<[u8]> + AsMut<[u8]>> Write for RingBuffer<S> {
 mod tests {
     use super::*;
 
-    #[aero_test::test]
+    #[aero_proc::test]
     fn partially_overwritten_buffer() {
         let mut buf = RingBuffer::new([0u8; 16]);
         write!(buf, "\nfirst\n").unwrap();
@@ -116,7 +116,7 @@ mod tests {
         assert_eq!(buf.extract(), "st\nsecond\nthird\n");
     }
 
-    #[aero_test::test]
+    #[aero_proc::test]
     fn clear_buffer() {
         let mut buf = RingBuffer::new([0u8; 5]);
         write!(buf, "hello").unwrap();

src/aero_kernel/src/utils/buffer.rs

@@ -281,7 +281,7 @@ ceil_div_impl!(u8 u16 u32 u64 usize u128);
 mod tests {
     use super::*;
 
-    #[aero_test::test]
+    #[aero_proc::test]
     fn unsigned_div_ceil() {
         assert_eq!((8usize).ceil_div(3), 3);
         assert_eq!((7usize).ceil_div(4), 2);

src/aero_kernel/src/utils/mod.rs

@@ -4,6 +4,10 @@ version = "0.1.0"
 authors = ["czapek1337 <[email protected]>"]
 edition = "2021"
 
+[features]
+test = []
+default = []
+
 [lib]
 proc-macro = true