refactor(user): use final_tests to test all

ChenRuiwei · Jul 20, 2024 · 225f8af · 225f8af
1 parent 068f3ad
commit 225f8af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/config/src/mm.rs b/config/src/mm.rs
@@ -14,7 +14,7 @@ pub const KERNEL_START_PHYS: usize = RAM_START + KERNEL_OFFSET;
 pub const KERNEL_START: usize = VIRT_START + KERNEL_OFFSET;
 
 pub const KERNEL_STACK_SIZE: usize = 64 * 1024;
-pub const KERNEL_HEAP_SIZE: usize = 48 * 1024 * 1024;
+pub const KERNEL_HEAP_SIZE: usize = 64 * 1024 * 1024;
 
 register_mut_const!(pub DTB_ADDR, usize, 0);
 

diff --git a/user/src/bin/runtestcase.rs → user/src/bin/final_tests.rs b/user/src/bin/runtestcase.rs → user/src/bin/final_tests.rs
@@ -10,20 +10,15 @@ use user_lib::{execve, fork, wait, waitpid};
 #[macro_use]
 extern crate user_lib;
 
-// const TESTCASES: [&str; 0] = [];
-
 const TESTCASES: [&str; 8] = [
-    // "cyclictest_testcode.sh",
     "busybox_testcode.sh",
     "lua_testcode.sh",
     "time-test",
     "libc-bench",
     "libctest_testcode.sh",
-    "iozone_testcode.sh",
     "lmbench_testcode.sh",
+    "iozone_testcode.sh",
     "unixbench_testcode.sh",
-    // "netperf_testcode.sh",
-    // "iperf_testcode.sh",
 ];
 
 #[no_mangle]
@@ -52,15 +47,13 @@ fn main() -> i32 {
                 waitpid(pid as usize, &mut exit_code);
             }
         }
-        println!(" !TEST FINISH! ");
     } else {
         loop {
             let mut exit_code: i32 = 0;
-            let _pid = wait(&mut exit_code);
-            // println!(
-            //     "[initproc] Released a zombie process, pid={}, exit_code={}",
-            //     pid, exit_code,
-            // );
+            let pid = wait(&mut exit_code);
+            if pid < 0 {
+                break;
+            }
         }
     }
     0