Merge branch 'master' of https://github.com/rcore-os/rcore-user

rcore-os · May 14, 2020 · 6252ad9 · 6252ad9
2 parents 3933db5 + a67c91f
commit 6252ad9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/test.sh b/test.sh
@@ -1,12 +1,17 @@
 #!/bin/ash
+# run this with ash test.sh
 set -e
 set -v
 echo "test begin"
+# ucore tests
 /ucore/badarg
 /ucore/exit
 /ucore/forktest
 /ucore/matrix
+/ucore/sleep
+/ucore/sleepkill
 /ucore/spin
 /ucore/testbss
 /ucore/yield
 echo "test end"
+halt -f
diff --git a/ucore/src/lib/syscall.c b/ucore/src/lib/syscall.c
@@ -110,7 +110,8 @@ sys_yield(void) {
 
 int
 sys_kill(int pid) {
-    return syscall(SYS_kill, pid);
+#define SIGKILL 9
+    return syscall(SYS_kill, pid, SIGKILL);
 }
 
 int