ASST3 test cleanup; added forkbomb

tfjmp · Apr 7, 2016 · 854931e · 854931e
1 parent a56bf00
commit 854931e
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 21 deletions.
diff --git a/test161/targets/asst3.tt b/test161/targets/asst3.tt
@@ -32,8 +32,8 @@ tests:
 
 # Checkpoint 2 (100 points)
 
-# Basic paging (30 points)
-  - id: vm/not-dumbvm2.t
+# Basic VM (30 points)
+  - id: vm/not-dumbvm-vm.t
     points: 5
   - id: vm/sort.t
     points: 5
@@ -46,7 +46,7 @@ tests:
   - id: vm/stacktest.t
     points: 5
 
-# Concurrent paging (40 points)
+# Concurrent VM (40 points)
   - id: vm/bigfork.t
     points: 8
   - id: vm/parallelvm.t
@@ -68,4 +68,6 @@ tests:
   - id: vm/zero.t
     points: 5
   - id: vm/stability/vm-stability.t
-    points: 15
+    points: 10
+  - id: vm/stability/forkbomb.t
+    points: 5
diff --git a/test161/tests/vm/bigfork.t b/test161/tests/vm/bigfork.t
@@ -1,11 +1,11 @@
 ---
 name: "Big Fork"
 description: >
-  Stress tests your VM by performing various matrix computations in
+  Stress tests your VM system by performing various matrix computations in
   multiple concurrent processes. This test is a cross between parallelvm
   and forktest.
 tags: [vm]
-depends: [not-dumbvm-paging, /syscalls/forktest.t]
+depends: [not-dumbvm-vm, /syscalls/forktest.t]
 sys161:
   cpus: 4
   ram: 8M

diff --git a/test161/tests/vm/ctest.t b/test161/tests/vm/ctest.t
@@ -4,7 +4,7 @@ description: >
   Turn a huge array into a linked list and hop along the list triggering
   an interesting page fault pattern.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 sys161:
   ram: 4M
 ---

diff --git a/test161/tests/vm/matmult.t b/test161/tests/vm/matmult.t
@@ -3,7 +3,7 @@ name: "Matrix Multiplication"
 description: >
   Test page faults by performing matrix multiplication on a large array.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 sys161:
   ram: 2M
 ---

diff --git a/test161/tests/vm/not-dumbvm2.t → test161/tests/vm/not-dumbvm-vm.t b/test161/tests/vm/not-dumbvm2.t → test161/tests/vm/not-dumbvm-vm.t
@@ -3,7 +3,7 @@ name: "Smarter VM 2"
 description: >
   Test whether you are using dumbvm by running the huge program,
   which dumbvm cannot run.
-tags: [vm, not-dumbvm-paging]
+tags: [vm, not-dumbvm-vm]
 depends: [console, not-dumbvm]
 sys161:
   ram: 4M

diff --git a/test161/tests/vm/palin.t b/test161/tests/vm/palin.t
@@ -4,6 +4,6 @@ description: >
   Test page faults by ensuring a known palindrone stored in static
   memory is actually a palindrone.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 ---
 | p /testbin/palin
diff --git a/test161/tests/vm/parallelvm.t b/test161/tests/vm/parallelvm.t
@@ -4,7 +4,7 @@ description: >
   Stress tests your VM by performing various matrix computations in
   multiple concurrent processes.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 sys161:
   cpus: 2
   ram: 4M

diff --git a/test161/tests/vm/quinthuge.t b/test161/tests/vm/quinthuge.t
@@ -3,7 +3,7 @@ name: "Quint Huge"
 description: >
   Run five concurent copies of huge.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 sys161:
   cpus: 2
   ram: 12M

diff --git a/test161/tests/vm/quintmat.t b/test161/tests/vm/quintmat.t
@@ -3,7 +3,7 @@ name: "Quint Matrix Mult"
 description: >
   Run five concurent copies of matmult.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 sys161:
   cpus: 2
   ram: 8M

diff --git a/test161/tests/vm/quintsort.t b/test161/tests/vm/quintsort.t
@@ -3,7 +3,7 @@ name: "Quint Sort"
 description: >
   Run five concurent copies of sort.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 sys161:
   cpus: 2
   ram: 8M

diff --git a/test161/tests/vm/sbrk-badcall.t b/test161/tests/vm/sbrk-badcall.t
@@ -3,6 +3,6 @@ name: "sbrk Badcall"
 description: >
   "Tests sbrk error conditions"
 tags: [sbrk]
-depends: [not-dumbvm-paging, shell]
+depends: [not-dumbvm-vm, shell]
 ---
 $ /testbin/badcall h
diff --git a/test161/tests/vm/sbrktest.t b/test161/tests/vm/sbrktest.t
@@ -4,7 +4,7 @@ description: >
   "Test various properites of your vm's heap management using
   the sbrk() system call."
 tags: [sbrk]
-depends: [not-dumbvm-paging, shell]
+depends: [not-dumbvm-vm, shell]
 sys161:
   ram: 4M
 ---

diff --git a/test161/tests/vm/sort.t b/test161/tests/vm/sort.t
@@ -3,7 +3,7 @@ name: "Sort Test"
 description: >
   Test page fault handling by sorting a large array.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 sys161:
   ram: 2M
 ---

diff --git a/test161/tests/vm/stability/forkbomb.t b/test161/tests/vm/stability/forkbomb.t
@@ -0,0 +1,17 @@
+---
+name: "Calm Like a Fork Bomb (VM)"
+tags: [stability-vm]
+depends: [console, not-dumbvm-vm]
+sys161:
+  ram: 2M
+monitor:
+  progresstimeout: 40.0
+  user:
+    enablemin: true
+    min: 0.001
+    max: 1.0
+  kernel:
+    enablemin: true
+    min: 0.01
+---
+p /testbin/forkbomb
diff --git a/test161/tests/vm/stability/vm-stability.t b/test161/tests/vm/stability/vm-stability.t
@@ -2,8 +2,8 @@
 name: "VM Stability Test"
 description:
   Runs various VM tests to test for synchronization issues.
-tags: [stability]
-depends: [shell, not-dumbvm-paging]
+tags: [stability-vm]
+depends: [/vm/bigfork.t, /vm/parallelvm.t, /vm/quintmat.t, /vm/zero.t, /vm/sort.t]
 sys161:
   ram: 8M
   cpus: 4

diff --git a/test161/tests/vm/stacktest.t b/test161/tests/vm/stacktest.t
@@ -3,7 +3,7 @@ name: "Stack Test"
 description: >
   Tests your VM stack handling by running the bigexec test from ASST2.
 tags: [vm]
-depends: [not-dumbvm-paging, shell]
+depends: [not-dumbvm-vm, shell]
 sys161:
   ram: 4M
 ---

diff --git a/test161/tests/vm/zero.t b/test161/tests/vm/zero.t
@@ -3,7 +3,7 @@ name: "Zero Test"
 description: >
   Tests that static memory regions are properly initialized.
 tags: [vm]
-depends: [not-dumbvm-paging]
+depends: [not-dumbvm-vm]
 sys161:
   ram: 4M
 ---