Working on ASST2 targets.

test161/targets/asst2.tt

@@ -5,72 +5,69 @@ type: asst
 kconfig: ASST2
 userland: true
 tests:
-# FS tests
-  - id: asst2/fs/consoletest.t
+# Make sure the console works
+  - id: syscalls/consoletest.t
     points: 2
-  - id: asst2/fs/opentest.t
+# File system system calls (48 points)
+  - id: syscalls/opentest.t
     points: 5
-  - id: asst2/fs/closetest.t
+  - id: syscalls/closetest.t
     points: 3
-  - id: asst2/fs/readwritetest.t
+  - id: syscalls/readwritetest.t
     points: 10
-  - id: asst2/fs/fileonlytest.t
+  - id: syscalls/fileonlytest.t
     points: 15
-  - id: asst2/fs/redirect.t
+  - id: syscalls/redirect.t
     points: 10
-  - id: asst2/fs/sparsefile.t
+  - id: syscalls/sparsefile.t
     points: 5
-
-# Process tests
-  - id: asst2/process/forktest.t
+# Process system call tests (50 points)
+  - id: syscalls/forktest.t
     points: 15
-  - id: asst2/process/shell.t
+  - id: syscalls/shell.t
     points: 10
-  - id: asst2/process/argtest.t
+  - id: syscalls/argtest.t
     points: 5
-  - id: asst2/process/bigexec.t
+  - id: syscalls/bigexec.t
     points: 10
-  - id: asst2/process/factorial.t
+  - id: syscalls/factorial.t
     points: 5
-  - id: asst2/process/add.t
+  - id: syscalls/add.t
     points: 5
-
-# All tests below this point are stability tests
-
-# badcalls
-  - id: asst2/stability/badcall/badcall-open.t
+# Stability tests (50 points)
+# Bad calls
+  - id: stability/badcall/badcall-open.t
     points: 3
-  - id: asst2/stability/badcall/badcall-close.t
+  - id: stability/badcall/badcall-close.t
     points: 3
-  - id: asst2/stability/badcall/badcall-read.t
+  - id: stability/badcall/badcall-read.t
     points: 3
-  - id: asst2/stability/badcall/badcall-write.t
+  - id: stability/badcall/badcall-write.t
     points: 3
-  - id: asst2/stability/badcall/badcall-lseek.t
+  - id: stability/badcall/badcall-lseek.t
     points: 3
-  - id: asst2/stability/badcall/badcall-dup2.t
+  - id: stability/badcall/badcall-dup2.t
     points: 3
-  - id: asst2/stability/badcall/badcall-execv.t
+  - id: stability/badcall/badcall-execv.t
     points: 5
-  - id: asst2/stability/badcall/badcall-waitpid.t
+  - id: stability/badcall/badcall-waitpid.t
     points: 5
-
-  - id: asst2/stability/crash/crash-allS.t
+# crash
+  - id: stability/crash/crash-allS.t
     points: 2
-
-  - id: asst2/stability/randcall.t
+# randcall
+  - id: stability/randcall.t
     points: 5
     commands:
       - id: /testbin/randcall
         args:
           - "-f"
-          - "-c 1000"
+          - "-c 100"
           - "-r {{randInt 1 4294967295}}"
           - "2"
-
-  - id: asst2/stability/forkbomb.t
+# forkbomb
+  - id: stability/forkbomb.t
     points: 10
-
-  - id: asst2/stability/forktest-stability.t
+# forktest
+  - id: stability/forktest-stability.t
     points: 5
-

test161/tests/asst2/fs/closetest.t

@@ -1,8 +0,0 @@
----
-name: "Close Test"
-description:
-  Tests close syscall. Attempts to close stdin and a normal file.
-tags: [fs]
-depends: [boot, /asst2/fs/opentest.t]
----
-p /testbin/closetest

test161/tests/asst2/fs/fileonlytest.t

@@ -1,13 +0,0 @@
----
-name: "Fileonly Test"
-description:
-  Tests open/close/read/write/lseek system calls.  Opens file, writes 512
-  bytes, skips 512 bytes and writes another 512 bytes(odd steps). Then seeks
-  back to beginning, and writes the even steps. Then seeks back to the
-  beginning and verifies that the contents are correct.
-tags: [fs]
-depends: [console, /asst2/fs/readwritetest.t,]
-sys161:
-  ram: 4M
----
-p /testbin/fileonlytest

test161/tests/asst2/fs/opentest.t

@@ -1,8 +0,0 @@
----
-name: "Open Test"
-description:
-  Tests open syscall. Attempts to open a file that is known to exist.
-tags: [fs]
-depends: [boot]
----
-p /testbin/opentest

test161/tests/asst2/fs/readwritetest.t

@@ -1,9 +0,0 @@
----
-name: "Read-Write Test"
-description:
-  Tests read and write syscalls. Attempts to write a file and then
-  read it back.
-tags: [fs]
-depends: [/asst2/fs/opentest.t]
----
-p /testbin/readwritetest

test161/tests/asst2/fs/redirect.t

@@ -1,11 +0,0 @@
----
-name: "Redirect Test"
-description:
-  Tests dup2. Opens a file handle, forks a new process and manipulates the file
-  table using dup2.
-tags: [fs]
-depends: [/asst2/process/forktest.t]
-sys161:
-  ram: 4M
----
-p /testbin/redirect

test161/tests/asst2/fs/sparsefile.t

@@ -1,11 +0,0 @@
----
-name: "Sparsefile Test"
-description:
-  Tests lseek to write one byte of data after skipping the first x bytes
-  in an empty file. Then attempts to read this byte.
-tags: [fs]
-depends: [shell, /asst2/fs/fileonlytest.t]
-sys161:
-  ram: 2M
----
-$ /testbin/sparsefile test 1048

test161/tests/syscalls/closetest.t

@@ -0,0 +1,10 @@
+---
+name: "Close Test"
+description: >
+  Tests sys_close by closing STDIN and a normal file.
+tags: [syscalls,filesyscalls]
+depends: [boot, /asst2/fs/opentest.t]
+sys161:
+  ram: 512K
+---
+p /testbin/closetest

test161/tests/syscalls/consoletest.t

@@ -1,8 +1,10 @@
 ---
 name: "Console Test"
+description: >
+  Make sure that the console works.
 tags: [console]
 depends: [boot]
 sys161:
-  ram: 4M
+  ram: 512K
 ---
 p /testbin/consoletest

test161/tests/syscalls/fileonlytest.t

@@ -0,0 +1,13 @@
+---
+name: "Fileonly Test"
+description: >
+  Tests sys_{open,close,read,write,lseek}. Opens a file, writes 512
+  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]
+depends: [console, /asst2/fs/readwritetest.t,]
+sys161:
+  ram: 512K
+---
+p /testbin/fileonlytest

test161/tests/syscalls/forktest.t

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

test161/tests/syscalls/opentest.t

@@ -0,0 +1,10 @@
+---
+name: "Open Test"
+description: >
+  Tests sys_open by attempting to open an existing file.
+tags: [syscalls,filesyscalls]
+depends: [boot]
+sys161:
+  ram: 512K
+---
+p /testbin/opentest

test161/tests/syscalls/readwritetest.t

@@ -0,0 +1,10 @@
+---
+name: "Read and Write Test"
+description: >
+  Tests sys_read and sys_write by reading and writing to a file.
+tags: [syscalls,filesyscalls]
+depends: [/asst2/fs/opentest.t]
+sys161:
+  ram: 512K
+---
+p /testbin/readwritetest

test161/tests/syscalls/redirect.t

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

test161/tests/syscalls/shell.t

@@ -4,7 +4,7 @@ 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: [proc, shell]
+tags: [syscalls,procsyscalls,shell]
 depends: [console]
 sys161:
   ram: 2M

test161/tests/syscalls/sparsefile.t

@@ -0,0 +1,11 @@
+---
+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]
+depends: [shell, /asst2/fs/fileonlytest.t]
+sys161:
+  ram: 512K
+---
+$ /testbin/sparsefile test 1048