X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2Fthreads%2FMake.tests;h=456903538990dedcdc15bfef32dc6e0112033ef1;hb=0eb663f85c834786c5b98186bb55a3e3224b8a2f;hp=64b9ef3fd2421fce7aa73030e0277a4c5e19fed3;hpb=615bf3b3d2a8573ed6fb9ddc0055745e163ac999;p=pintos-anon

diff --git a/src/tests/threads/Make.tests b/src/tests/threads/Make.tests
index 64b9ef3..4569035 100644
--- a/src/tests/threads/Make.tests
+++ b/src/tests/threads/Make.tests
@@ -2,37 +2,52 @@
 
 # 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-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
 tests/threads_SRC += tests/threads/priority-change.c
 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		\
+tests/threads/mlfqs-load-60.output		\
+tests/threads/mlfqs-load-avg.output		\
+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-block.output
+
+$(MLFQS_OUTPUTS): KERNELFLAGS += -mlfqs
+$(MLFQS_OUTPUTS): TIMEOUT = 480
 
-tests/threads/mlfqs-load-1.output				\
-tests/threads/mlfqs-load-60.output				\
-tests/threads/mlfqs-load-avg.output				\
-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: KERNELFLAGS += -mlfqs