ASST2 target cleanup.

test161/targets/asst2.tt

@@ -5,7 +5,7 @@ type: asst
 kconfig: ASST2
 userland: true
 tests:
-# Make sure the console works
+# Make sure the console works (10 points)
   - id: syscalls/consoletest.t
     points: 10
 # File system system calls (50 points)
@@ -35,26 +35,26 @@ tests:
   - id: syscalls/add.t
     points: 5
 # Stability tests (40 points)
-# Bad calls
+# Bad calls (10 points)
   - id: stability/badcall/badcall-open.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-close.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-read.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-write.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-lseek.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-dup2.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-execv.t
-    points: 5
+    points: 2
   - id: stability/badcall/badcall-waitpid.t
-    points: 5
+    points: 2
 # crash
   - id: stability/crash/crash-allS.t
-    points: 2
+    points: 5
 # randcall
   - id: stability/randcall.t
     points: 5
@@ -63,11 +63,11 @@ tests:
         args:
           - "-f"
           - "-c 100"
-          - "-r {{randInt 1 4294967295}}"
+          - "-r 421"
           - "2"
 # forkbomb
   - id: stability/forkbomb.t
     points: 10
 # forktest
   - id: stability/forktest-stability.t
-    points: 5
+    points: 10

test161/tests/stability/badcall/badcall-close.t

@@ -1,9 +1,8 @@
 ---
-name: "Badcall-close Test"
+name: "Bad Close"
 description:
-  Tests whether close syscall is implemented correctly by invoking it in all
+  Stability test for sys_close.
-  possible wrong ways.
+tags: [badcall,stability]
-tags: [badcall, stability]
 depends: [shell]
 ---
 $ /testbin/badcall f

test161/tests/stability/badcall/badcall-dup2.t

@@ -1,9 +1,8 @@
 ---
-name: "Badcall-dup2 Test"
+name: "Bad Dup"
 description:
-  Tests whether dup2 syscall is implemented correctly by invoking it in all
+  Stability test for sys_dup2.
-  possible wrong ways.
+tags: [badcall,stability]
-tags: [badcall, stability]
 depends: [shell]
 ---
 $ /testbin/badcall w

test161/tests/stability/badcall/badcall-execv.t

@@ -1,11 +1,10 @@
 ---
-name: "Badcall-execv Test"
+name: "Bad Exec"
 description:
-  Tests whether execv syscall is implemented correctly by invoking it in all
+  Stability test for sys_exec.
-  possible wrong ways.
+tags: [badcall,stability]
-tags: [badcall, stability]
 depends: [shell]
 sys161:
-  ram: 4M
+  ram: 512K
 ---
 $ /testbin/badcall a

test161/tests/stability/badcall/badcall-lseek.t

@@ -1,9 +1,10 @@
 ---
-name: "Badcall-lseek Test"
+name: "Bad Seek"
 description:
-  Tests whether lseek syscall is implemented correctly by invoking it in all
+  Stability test for sys_lseek.
-  possible wrong ways.
+tags: [badcall,stability]
-tags: [badcall, stability]
 depends: [shell]
+sys161:
+  ram: 512K
 ---
 $ /testbin/badcall j

test161/tests/stability/badcall/badcall-open.t

@@ -1,9 +1,10 @@
 ---
-name: "Badcall-open Test"
+name: "Bad Open"
 description:
-  Tests whether open syscall is implemented correctly by invoking it in all
+  Stability test for sys_open.
-  possible wrong ways.
+tags: [badcall,stability]
-tags: [badcall, stability]
 depends: [shell]
+sys161:
+  ram: 512K
 ---
 $ /testbin/badcall c

test161/tests/stability/badcall/badcall-read.t

@@ -1,9 +1,8 @@
 ---
-name: "Badcall-read Test"
+name: "Bad Read"
 description:
-  Tests whether read syscall is implemented correctly by invoking it in all
+  Stability test for sys_read.
-  possible wrong ways.
+tags: [badcall,stability]
-tags: [badcall, stability]
 depends: [shell]
 ---
 $ /testbin/badcall d

test161/tests/stability/badcall/badcall-waitpid.t

@@ -1,11 +1,10 @@
 ---
-name: "Badcall-waitpid Test"
+name: "Bad Wait"
 description:
-  Tests whether waitpid syscall is implemented correctly by invoking it in all
+  Stability test for sys_wait.
-  possible wrong ways.
+tags: [badcall,stability]
-tags: [badcall, stability]
 depends: [shell]
 sys161:
-  ram: 4M
+  ram: 512K
 ---
 $ /testbin/badcall b

test161/tests/stability/badcall/badcall-write.t

@@ -1,9 +1,10 @@
 ---
-name: "Badcall-write Test"
+name: "Bad Write"
 description:
-  Tests whether write syscall is implemented correctly by invoking it in all
+  Stability test for sys_write.
-  possible wrong ways.
+tags: [badcall,stability]
-tags: [badcall, stability]
 depends: [shell]
+sys161:
+  ram: 512K
 ---
 $ /testbin/badcall e

test161/tests/stability/crash/crash-allS.t

@@ -1,12 +1,10 @@
 ---
-name: "Crash-all Shell Test"
+name: "Crash"
-description:
+description: >
-  Tests whether your system correctly handles a variety of
+  Tests whether your system correctly handles a variety of bad process
-  illegal attempts from userspace processes to access resources that
+  behavior.
-  do not belong to it. Please see userland/testbin/crash for more info.
+tags: [crash,stability]
-  Runs it from the shell.
+depends: [shell,sys_fork]
-tags: [stability, crash, crash-fork]
-depends: [shell, /asst2/process/forktest.t]
 sys161:
   ram: 4M
 ---

test161/tests/stability/forkbomb.t

@@ -1,5 +1,5 @@
 ---
-name: "Forkbomb"
+name: "Calm Like a Fork Bomb"
 tags: [stability]
 depends: [console]
 sys161:

test161/tests/stability/forktest-stability.t

@@ -1,9 +1,9 @@
 ---
-name: "Forktest Stability Test"
+name: "Fork Stability Test"
 description:
   Runs forktest 5 times to check for synchronization issues.
 tags: [stability]
-depends: [shell, /asst2/process/forktest.t]
+depends: [shell]
 sys161:
   ram: 16M
 ---

test161/tests/stability/randcall.t

@@ -1,12 +1,10 @@
 ---
 name: "Randcall Test"
-description:
+description: >
-  Invokes system calls on random with random arguments.
+  Invokes system calls with random arguments.
-  Tests whether your system can gracefully recover from
+tags: [stability]
-  bad system calls.
-tags: [randcall-2, stability]
 depends: [shell]
 sys161:
   ram: 16M
 ---
-$ /testbin/randcall -f -c 1000 -r 30 2
+$ /testbin/randcall -f -c 100 -r 421 2

test161/tests/syscalls/add.t

@@ -2,7 +2,7 @@
 name: "Add Test"
 description:
   Adds two randomly generated numbers.
-tags: [proc, fun]
+tags: [sys_exec,procsyscalls,syscalls]
 depends: [shell]
 ---
 $ /testbin/add

test161/tests/syscalls/argtest.t

@@ -2,7 +2,7 @@
 name: "Argtest"
 description:
   Checks whether your kernel supports argument passing.
-tags: [argtest, proc]
+tags: [sys_exec,procsyscalls,syscalls]
-depends: [console]
+depends: [shell]
 ---
 $ /testbin/argtest

test161/tests/syscalls/bigexec.t

@@ -1,10 +1,10 @@
----
+--
 name: "Bigexec Test"
 description:
   Tests to ensure that the argument passing logic is not hard-coded
   to small argument lengths.
-tags: [proc]
+tags: [sys_exec,procsyscalls,syscalls]
-depends: [shell, /asst2/process/argtest.t]
+depends: [shell]
 sys161:
   ram: 4M
 ---

test161/tests/syscalls/closetest.t

@@ -2,8 +2,8 @@
 name: "Close Test"
 description: >
   Tests sys_close by closing STDIN and a normal file.
-tags: [syscalls,filesyscalls]
+tags: [sys_close,filesyscalls,syscalls]
-depends: [boot, /asst2/fs/opentest.t]
+depends: [console,sys_open]
 sys161:
   ram: 512K
 ---

test161/tests/syscalls/factorial.t

@@ -3,7 +3,7 @@ name: "Factorial Test"
 description:
   Attempts to calculate factorial by recursive replacing the current process
   with the number computed thus far.
-tags: [proc, fun]
+tags: [sys_exec,procsyscalls,syscalls]
 depends: [shell]
 sys161:
   ram: 4M

test161/tests/syscalls/fileonlytest.t

@@ -5,8 +5,8 @@ description: >
   bytes, skips 512 bytes and writes another 512 bytes (odd steps). Seeks
   back to beginning and writes the even steps. Then seeks back to the
   beginning and verifies that the contents are correct.
-tags: [syscalls,filesyscalls]
+tags: [filesyscalls,syscalls]
-depends: [console, /asst2/fs/readwritetest.t,]
+depends: [console]
 sys161:
   ram: 512K
 ---

test161/tests/syscalls/forktest.t

@@ -2,8 +2,8 @@
 name: "Fork Test"
 description: >
   Test that fork works.
-tags: [syscalls,procsyscalls]
+tags: [sys_fork,procsyscalls,syscalls]
-depends: [console,/asst2/fs/readwritetest.t]
+depends: [console]
 sys161:
   ram: 4M
 ---

test161/tests/syscalls/opentest.t

@@ -2,8 +2,8 @@
 name: "Open Test"
 description: >
   Tests sys_open by attempting to open an existing file.
-tags: [syscalls,filesyscalls]
+tags: [sys_open,filesyscalls,syscalls]
-depends: [boot]
+depends: [console]
 sys161:
   ram: 512K
 ---

test161/tests/syscalls/readwritetest.t

@@ -2,8 +2,8 @@
 name: "Read and Write Test"
 description: >
   Tests sys_read and sys_write by reading and writing to a file.
-tags: [syscalls,filesyscalls]
+tags: [sys_read,sys_write,filesyscalls,syscalls]
-depends: [/asst2/fs/opentest.t]
+depends: [console,sys_open]
 sys161:
   ram: 512K
 ---

test161/tests/syscalls/redirect.t

@@ -3,9 +3,9 @@ name: "Redirect Test"
 description: >
   Tests sys_dup2. Opens a file handle, then forks a new process which
   manipulates the file table.
-tags: [syscalls,filesyscalls]
+tags: [sys_dup2,filesyscalls,syscalls]
-depends: [/asst2/process/forktest.t]
+depends: [console,sys_fork]
 sys161:
-  ram: 512K
+  ram: 1M
 ---
 p /testbin/redirect

test161/tests/syscalls/shell.t

@@ -4,10 +4,10 @@ description:
   Tests whether the shell works by running /testbin/consoletest in the shell.
   The shell test tries to identify a race condition between the shell and the
   program that the shell is trying to run.
-tags: [syscalls,procsyscalls,shell]
+tags: [shell,procsyscalls,syscalls]
 depends: [console]
 sys161:
-  ram: 2M
+  ram: 1M
 ---
 $ /testbin/shelltest
 $ /testbin/shelltest

test161/tests/syscalls/sparsefile.t

@@ -3,9 +3,9 @@ name: "Sparsefile Test"
 description: >
   Tests sys_lseek by writing one byte of data after skipping the beginning of
   an empty file and then attempting to read this byte.
-tags: [syscalls,filesyscalls]
+tags: [sys_lseek,filesyscalls,syscalls]
-depends: [shell, /asst2/fs/fileonlytest.t]
+depends: [shell]
 sys161:
-  ram: 512K
+  ram: 1M
 ---
 $ /testbin/sparsefile test 1048