reorganize file structure to match the upstream requirements

12 files changed, 0 insertions, 111 deletions

diff --git a/pintos-progos/tests/intro/alarm-clock/Make.tests b/pintos-progos/tests/intro/alarm-clock/Make.tests
deleted file mode 100644
index 55ad443..0000000
--- a/pintos-progos/tests/intro/alarm-clock/Make.tests
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- 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/pintos-progos/tests/intro/alarm-clock/Rubric b/pintos-progos/tests/intro/alarm-clock/Rubric
deleted file mode 100644
index 0cf3dc1..0000000
--- a/pintos-progos/tests/intro/alarm-clock/Rubric
+++ /dev/null
@@ -1,7 +0,0 @@
-Functionality and robustness of alarm clock:
-4       alarm-single
-4       alarm-multiple
-4       alarm-simultaneous
-1       alarm-zero
-1       alarm-negative
-
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-multiple.ck b/pintos-progos/tests/intro/alarm-clock/alarm-multiple.ck
deleted file mode 120000
index f3a9edc..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-multiple.ck
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-multiple.ck
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-negative.c b/pintos-progos/tests/intro/alarm-clock/alarm-negative.c
deleted file mode 120000
index 483aa63..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-negative.c
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-negative.c
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-negative.ck b/pintos-progos/tests/intro/alarm-clock/alarm-negative.ck
deleted file mode 120000
index 279520e..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-negative.ck
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-negative.ck
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-simultaneous.c b/pintos-progos/tests/intro/alarm-clock/alarm-simultaneous.c
deleted file mode 120000
index 6362b61..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-simultaneous.c
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-simultaneous.c
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-simultaneous.ck b/pintos-progos/tests/intro/alarm-clock/alarm-simultaneous.ck
deleted file mode 120000
index 7226d0c..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-simultaneous.ck
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-simultaneous.ck
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-single.ck b/pintos-progos/tests/intro/alarm-clock/alarm-single.ck
deleted file mode 120000
index 7f98a51..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-single.ck
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-single.ck
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-wait.c b/pintos-progos/tests/intro/alarm-clock/alarm-wait.c
deleted file mode 120000
index 2755ae5..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-wait.c
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-wait.c
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-zero.c b/pintos-progos/tests/intro/alarm-clock/alarm-zero.c
deleted file mode 120000
index a1f3ca7..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-zero.c
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-zero.c
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/alarm-zero.ck b/pintos-progos/tests/intro/alarm-clock/alarm-zero.ck
deleted file mode 120000
index 3f98d64..0000000
--- a/pintos-progos/tests/intro/alarm-clock/alarm-zero.ck
+++ /dev/null
@@ -1 +0,0 @@
-../../threads/alarm-zero.ck
\ No newline at end of file
diff --git a/pintos-progos/tests/intro/alarm-clock/tests.c b/pintos-progos/tests/intro/alarm-clock/tests.c
deleted file mode 100644
index 4a96360..0000000
--- a/pintos-progos/tests/intro/alarm-clock/tests.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#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);
-}
-