diff --git a/test161/commands/asst2.tc b/test161/commands/asst2.tc index cb92079..027362d 100644 --- a/test161/commands/asst2.tc +++ b/test161/commands/asst2.tc @@ -3,32 +3,21 @@ templates: panics: maybe output: - text: "/testbin/consoletest: Able was i ere i saw elbA" - - - name: /testbin/opentest panics: maybe - - name: /testbin/readwritetest panics: maybe output: - text: "/testbin/readwritetest: h4xa0rRq0Vgbc96tiYJ^!#nXzZSAKPO" - - name: /testbin/closetest panics: maybe - - - name: /testbin/fileonlytest panics: maybe - - name: /testbin/redirect - - name: /testbin/sparsefile panics: maybe - - name: /extratests/badcall - name: faulter - - - name: /testbin/forkbomb timesout: yes timeout: 15.0 @@ -39,19 +28,14 @@ templates: - name: kmalloc output: - text: "kmalloc: out of memory" - - - name: /testbin/crash - name: /testbin/forktest - name: /testbin/randcall - - name: /testbin/shelltest output: - text: "/testbin/shelltest: line-1: Able was i ere i saw elbA" - text: "/testbin/shelltest: line-2: Able was i ere i saw elbA" - text: "/testbin/shelltest: line-3: Able was i ere i saw elbA" - - - name: /testbin/argtest input: - "{{randString 1 2}}" @@ -67,20 +51,15 @@ templates: - text: "/testbin/argtest: /testbin/argtest" - text: "{{range $index, $element := .Args}}/testbin/argtest: {{$element}}\n{{end}}" - text: "/testbin/argtest: [NULL]" - - name: /testbin/bigexec - - name: /testbin/factorial input: - "{{randInt 6 10}}" output: - text: "/testbin/factorial: {{$n:= index .Args 0 | atoi}}{{factorial $n}}\n" - - name: /testbin/add input: - "{{randInt 2 1000}}" - "{{randInt 2 4000}}" output: - text: "/testbin/add: {{$x:= index .Args 0 | atoi}}{{$y := index .Args 1 | atoi}}{{add $x $y}}" - - diff --git a/test161/targets/asst2.tt b/test161/targets/asst2.tt index 6a5b4a3..8e9c8c5 100644 --- a/test161/targets/asst2.tt +++ b/test161/targets/asst2.tt @@ -7,12 +7,12 @@ userland: true tests: # Make sure the console works - id: syscalls/consoletest.t - points: 2 -# File system system calls (48 points) + points: 10 +# File system system calls (50 points) - id: syscalls/opentest.t points: 5 - id: syscalls/closetest.t - points: 3 + points: 5 - id: syscalls/readwritetest.t points: 10 - id: syscalls/fileonlytest.t @@ -34,7 +34,7 @@ tests: points: 5 - id: syscalls/add.t points: 5 -# Stability tests (50 points) +# Stability tests (40 points) # Bad calls - id: stability/badcall/badcall-open.t points: 3 diff --git a/test161/tests/syscalls/consoletest.t b/test161/tests/syscalls/consoletest.t index bd644bd..1ac78cd 100644 --- a/test161/tests/syscalls/consoletest.t +++ b/test161/tests/syscalls/consoletest.t @@ -1,7 +1,7 @@ --- name: "Console Test" description: > - Make sure that the console works. + Make sure that the console works and the kernel menu waits appropriately. tags: [console] depends: [boot] sys161: diff --git a/test161/tests/syscalls/forktest.t b/test161/tests/syscalls/forktest.t index 7c7705a..660ef5a 100644 --- a/test161/tests/syscalls/forktest.t +++ b/test161/tests/syscalls/forktest.t @@ -3,7 +3,7 @@ name: "Fork Test" description: > Test that fork works. tags: [syscalls,procsyscalls] -depends: [console, /asst2/fs/readwritetest.t] +depends: [console,/asst2/fs/readwritetest.t] sys161: ram: 4M ---