- added priority-donate-chain test which tests 8-level deep nested donation

[pintos-anon] / src / tests / threads / Make.tests

diff --git a/src/tests/threads/Make.tests b/src/tests/threads/Make.tests
index 21d3b8737d1634f858a4e319659cebdbcfe69b13..456903538990dedcdc15bfef32dc6e0112033ef1 100644 (file)
--- a/src/tests/threads/Make.tests
+++ b/src/tests/threads/Make.tests
@@ -2,16 +2,19 @@
 
 # Test names.
 tests/threads_TESTS = $(addprefix tests/threads/,alarm-single          \
-alarm-multiple alarm-priority alarm-zero alarm-negative                        \
-priority-change priority-donate-one priority-donate-multiple           \
-priority-donate-multiple2                                              \
-priority-donate-nest priority-fifo priority-preempt priority-sema      \
-priority-condvar mlfqs-load-1 mlfqs-load-60 mlfqs-load-avg             \
-mlfqs-recent-1 mlfqs-fair-2 mlfqs-fair-20 mlfqs-nice-2 mlfqs-nice-10)
+alarm-multiple alarm-simultaneous alarm-priority alarm-zero            \
+alarm-negative priority-change priority-donate-one                     \
+priority-donate-multiple priority-donate-multiple2                     \
+priority-donate-nest priority-donate-sema priority-donate-lower                \
+priority-fifo priority-preempt priority-sema priority-condvar          \
+priority-donate-chain                                                   \
+mlfqs-load-1 mlfqs-load-60 mlfqs-load-avg mlfqs-recent-1 mlfqs-fair-2  \
+mlfqs-fair-20 mlfqs-nice-2 mlfqs-nice-10 mlfqs-block)
 
 # Sources for tests.
 tests/threads_SRC  = tests/threads/tests.c
 tests/threads_SRC += tests/threads/alarm-wait.c
+tests/threads_SRC += tests/threads/alarm-simultaneous.c
 tests/threads_SRC += tests/threads/alarm-priority.c
 tests/threads_SRC += tests/threads/alarm-zero.c
 tests/threads_SRC += tests/threads/alarm-negative.c
@@ -20,15 +23,19 @@ tests/threads_SRC += tests/threads/priority-donate-one.c
 tests/threads_SRC += tests/threads/priority-donate-multiple.c
 tests/threads_SRC += tests/threads/priority-donate-multiple2.c
 tests/threads_SRC += tests/threads/priority-donate-nest.c
+tests/threads_SRC += tests/threads/priority-donate-sema.c
+tests/threads_SRC += tests/threads/priority-donate-lower.c
 tests/threads_SRC += tests/threads/priority-fifo.c
 tests/threads_SRC += tests/threads/priority-preempt.c
 tests/threads_SRC += tests/threads/priority-sema.c
 tests/threads_SRC += tests/threads/priority-condvar.c
+tests/threads_SRC += tests/threads/priority-donate-chain.c
 tests/threads_SRC += tests/threads/mlfqs-load-1.c
 tests/threads_SRC += tests/threads/mlfqs-load-60.c
 tests/threads_SRC += tests/threads/mlfqs-load-avg.c
 tests/threads_SRC += tests/threads/mlfqs-recent-1.c
 tests/threads_SRC += tests/threads/mlfqs-fair.c
+tests/threads_SRC += tests/threads/mlfqs-block.c
 
 MLFQS_OUTPUTS =                                \
 tests/threads/mlfqs-load-1.output              \
@@ -38,8 +45,9 @@ tests/threads/mlfqs-recent-1.output           \
 tests/threads/mlfqs-fair-2.output              \
 tests/threads/mlfqs-fair-20.output             \
 tests/threads/mlfqs-nice-2.output              \
-tests/threads/mlfqs-nice-10.output
+tests/threads/mlfqs-nice-10.output             \
+tests/threads/mlfqs-block.output
 
 $(MLFQS_OUTPUTS): KERNELFLAGS += -mlfqs
-$(MLFQS_OUTPUTS): TIMEOUT = 240
+$(MLFQS_OUTPUTS): TIMEOUT = 480