reorganize file structure to match the upstream requirements

12 files changed, 111 insertions, 0 deletions

diff --git a/tests/intro/alarm-clock/Make.tests b/tests/intro/alarm-clock/Make.tests
new file mode 100644
index 0000000..55ad443
--- /dev/null
+++ b/tests/intro/alarm-clock/Make.tests
@@ -0,0 +1,15 @@
+# -*- makefile -*-
+tests/intro/alarm-clock/%.output: SIMULATOR = bochs
+tests/intro/alarm-clock/%.output: PINTOSOPTS += --kernel-test
+tests/intro/alarm-clock/%.output: FILESYSSOURCE = --filesys-size=1
+
+# Test names.
+tests/intro/alarm-clock_TESTS = $(addprefix tests/intro/alarm-clock/,alarm-single \
+alarm-multiple alarm-simultaneous alarm-zero alarm-negative)
+
+# Sources for tests.
+tests/intro/alarm-clock_SRC  = tests/intro/alarm-clock/tests.c
+tests/intro/alarm-clock_SRC += tests/intro/alarm-clock/alarm-wait.c
+tests/intro/alarm-clock_SRC += tests/intro/alarm-clock/alarm-simultaneous.c
+tests/intro/alarm-clock_SRC += tests/intro/alarm-clock/alarm-zero.c
+tests/intro/alarm-clock_SRC += tests/intro/alarm-clock/alarm-negative.c
diff --git a/tests/intro/alarm-clock/Rubric b/tests/intro/alarm-clock/Rubric
new file mode 100644
index 0000000..0cf3dc1
--- /dev/null
+++ b/tests/intro/alarm-clock/Rubric
@@ -0,0 +1,7 @@
+Functionality and robustness of alarm clock:
+4       alarm-single
+4       alarm-multiple
+4       alarm-simultaneous
+1       alarm-zero
+1       alarm-negative
+
diff --git a/tests/intro/alarm-clock/alarm-multiple.ck b/tests/intro/alarm-clock/alarm-multiple.ck
new file mode 120000
index 0000000..f3a9edc
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-multiple.ck
@@ -0,0 +1 @@
+../../threads/alarm-multiple.ck
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/alarm-negative.c b/tests/intro/alarm-clock/alarm-negative.c
new file mode 120000
index 0000000..483aa63
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-negative.c
@@ -0,0 +1 @@
+../../threads/alarm-negative.c
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/alarm-negative.ck b/tests/intro/alarm-clock/alarm-negative.ck
new file mode 120000
index 0000000..279520e
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-negative.ck
@@ -0,0 +1 @@
+../../threads/alarm-negative.ck
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/alarm-simultaneous.c b/tests/intro/alarm-clock/alarm-simultaneous.c
new file mode 120000
index 0000000..6362b61
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-simultaneous.c
@@ -0,0 +1 @@
+../../threads/alarm-simultaneous.c
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/alarm-simultaneous.ck b/tests/intro/alarm-clock/alarm-simultaneous.ck
new file mode 120000
index 0000000..7226d0c
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-simultaneous.ck
@@ -0,0 +1 @@
+../../threads/alarm-simultaneous.ck
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/alarm-single.ck b/tests/intro/alarm-clock/alarm-single.ck
new file mode 120000
index 0000000..7f98a51
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-single.ck
@@ -0,0 +1 @@
+../../threads/alarm-single.ck
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/alarm-wait.c b/tests/intro/alarm-clock/alarm-wait.c
new file mode 120000
index 0000000..2755ae5
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-wait.c
@@ -0,0 +1 @@
+../../threads/alarm-wait.c
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/alarm-zero.c b/tests/intro/alarm-clock/alarm-zero.c
new file mode 120000
index 0000000..a1f3ca7
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-zero.c
@@ -0,0 +1 @@
+../../threads/alarm-zero.c
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/alarm-zero.ck b/tests/intro/alarm-clock/alarm-zero.ck
new file mode 120000
index 0000000..3f98d64
--- /dev/null
+++ b/tests/intro/alarm-clock/alarm-zero.ck
@@ -0,0 +1 @@
+../../threads/alarm-zero.ck
\ No newline at end of file
diff --git a/tests/intro/alarm-clock/tests.c b/tests/intro/alarm-clock/tests.c
new file mode 100644
index 0000000..4a96360
--- /dev/null
+++ b/tests/intro/alarm-clock/tests.c
@@ -0,0 +1,80 @@
+#include "tests/threads/tests.h"
+#include <debug.h>
+#include <string.h>
+#include <stdio.h>
+
+struct test 
+  {
+    const char *name;
+    test_func *function;
+  };
+
+static const struct test tests[] = 
+  {
+    {"alarm-single", test_alarm_single},
+    {"alarm-multiple", test_alarm_multiple},
+    {"alarm-simultaneous", test_alarm_simultaneous},
+    {"alarm-zero", test_alarm_zero},
+    {"alarm-negative", test_alarm_negative},
+  };
+
+static const char *test_name;
+
+/* Runs the test named NAME. */
+void
+run_test (const char *name) 
+{
+  const struct test *t;
+
+  for (t = tests; t < tests + sizeof tests / sizeof *tests; t++)
+    if (!strcmp (name, t->name))
+      {
+        test_name = name;
+        msg ("begin");
+        t->function ();
+        msg ("end");
+        return;
+      }
+  PANIC ("no test named \"%s\"", name);
+}
+
+/* Prints FORMAT as if with printf(),
+   prefixing the output by the name of the test
+   and following it with a new-line character. */
+void
+msg (const char *format, ...) 
+{
+  va_list args;
+  
+  printf ("(%s) ", test_name);
+  va_start (args, format);
+  vprintf (format, args);
+  va_end (args);
+  putchar ('\n');
+}
+
+/* Prints failure message FORMAT as if with printf(),
+   prefixing the output by the name of the test and FAIL:
+   and following it with a new-line character,
+   and then panics the kernel. */
+void
+fail (const char *format, ...) 
+{
+  va_list args;
+  
+  printf ("(%s) FAIL: ", test_name);
+  va_start (args, format);
+  vprintf (format, args);
+  va_end (args);
+  putchar ('\n');
+
+  PANIC ("test failed");
+}
+
+/* Prints a message indicating the current test passed. */
+void
+pass (void) 
+{
+  printf ("(%s) PASS\n", test_name);
+}
+