Fix riscv32 testing

master
Jiajie Chen 6 years ago
parent 7331404fc7
commit f1971c489a

@ -273,7 +273,7 @@ justrunui: build
-device virtio-mouse-device -device virtio-mouse-device
justruntest: build 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) debug: $(kernel) $(kernel_img)
@qemu-system-$(arch) $(qemu_opts) -s -S & @qemu-system-$(arch) $(qemu_opts) -s -S &

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

1
tests/.gitignore vendored

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

@ -13,7 +13,9 @@ do
wait $pid 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 echo testing $f pass
done done

Loading…
Cancel
Save