Fix riscv32 testing

kernel/Makefile

@@ -273,7 +273,7 @@ justrunui: build
 		-device virtio-mouse-device
 
 justruntest: build
-	@qemu-system-$(arch) $(qemu_opts) --append $(init) -serial file:../tests/stdout -monitor null
+	@qemu-system-$(arch) $(filter-out -serial mon:stdio, $(qemu_opts)) --append $(init) -serial file:../tests/stdout -monitor null
 
 debug: $(kernel) $(kernel_img)
 	@qemu-system-$(arch) $(qemu_opts) -s -S &

kernel/src/shell.rs

@@ -45,9 +45,9 @@ pub fn add_user_shell() {
     let inode = ROOT_INODE.lookup(&cmdline).unwrap();
     processor().manager().add(Thread::new_user(
         &inode,
+        &cmdline,
         cmdline.split(' ').map(|s| s.into()).collect(),
         Vec::new(),
-        Vec::new(),
     ));
 }
 

tests/.gitignore

@@ -1 +1,2 @@
 stdout
+stdout.new

tests/hello_rust.out

@@ -1,3 +1,3 @@
-Hello Rust uCore!
+Hello Rust uCore!
-I am process 0.
+I am process 0.
-hello pass.
+hello pass.

tests/test.sh

@@ -13,7 +13,9 @@ do
 
     wait $pid
 
-    diff -I 'bbl loader' -I 'Hello RISCV! in hart' -u ${f%.cmd}.out stdout || { echo 'testing failed for' $f; exit 1; }
+    awk 'NR > 25 { print }' < stdout > stdout.new
+
+    diff -u ${f%.cmd}.out stdout.new || { echo 'testing failed for' $f; exit 1; }
 
     echo testing $f pass
 done