reorganize file structure to match the upstream requirements

24 files changed, 238 insertions, 0 deletions

diff --git a/tests/intro/Grading b/tests/intro/Grading
new file mode 100644
index 0000000..b1ff6b8
--- /dev/null
+++ b/tests/intro/Grading
@@ -0,0 +1,5 @@
+# Percentage of the testing point total designated for each set of
+# tests.
+
+50.0%   tests/intro/alarm-clock/Rubric
+50.0%   tests/intro/userprog-args/Rubric
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);
+}
+
diff --git a/tests/intro/userprog-args/Make.tests b/tests/intro/userprog-args/Make.tests
new file mode 100644
index 0000000..6f7a474
--- /dev/null
+++ b/tests/intro/userprog-args/Make.tests
@@ -0,0 +1,27 @@
+# -*- makefile -*-
+
+tests/intro/userprog-args/%.output: FILESYSSOURCE = --filesys-size=2
+tests/intro/userprog-args/%.output: PUTFILES = $(filter-out kernel.bin loader.bin, $^)
+tests/intro/userprog-args/%.output: SIMULATOR = --qemu
+tests/intro/userprog-args_TESTS = $(addprefix tests/intro/userprog-args/,args-none      \
+args-single args-multiple args-many args-dbl-space args-limit)
+
+tests/intro/userprog-args_PROGS = $(tests/intro/userprog-args_TESTS) $(addprefix \
+tests/intro/userprog-args/,child-simple child-args)
+
+tests/intro/userprog-args/args-none_SRC = tests/intro/userprog-args/args.c
+tests/intro/userprog-args/args-single_SRC = tests/intro/userprog-args/args.c
+tests/intro/userprog-args/args-multiple_SRC = tests/intro/userprog-args/args.c
+tests/intro/userprog-args/args-many_SRC = tests/intro/userprog-args/args.c
+tests/intro/userprog-args/args-dbl-space_SRC = tests/intro/userprog-args/args.c
+tests/intro/userprog-args/args-limit_SRC = tests/intro/userprog-args/args-limit.c
+
+tests/intro/userprog-args/child-simple_SRC = tests/intro/userprog-args/child-simple.c
+tests/intro/userprog-args/child-args_SRC = tests/intro/userprog-args/args.c
+
+$(foreach prog,$(tests/intro/userprog-args_PROGS),$(eval $(prog)_SRC += tests/lib.c))
+
+tests/intro/userprog-args/args-single_ARGS = onearg
+tests/intro/userprog-args/args-multiple_ARGS = some arguments for you!
+tests/intro/userprog-args/args-many_ARGS = a b c d e f g h i j k l m n o p q r s t u v
+tests/intro/userprog-args/args-dbl-space_ARGS = two  spaces!
diff --git a/tests/intro/userprog-args/Rubric b/tests/intro/userprog-args/Rubric
new file mode 100644
index 0000000..f5474c5
--- /dev/null
+++ b/tests/intro/userprog-args/Rubric
@@ -0,0 +1,7 @@
+Functionality of stack setup:
+3       args-none
+3       args-single
+3       args-multiple
+3       args-many
+3       args-dbl-space
+3       args-limit
diff --git a/tests/intro/userprog-args/args-dbl-space.ck b/tests/intro/userprog-args/args-dbl-space.ck
new file mode 120000
index 0000000..730d787
--- /dev/null
+++ b/tests/intro/userprog-args/args-dbl-space.ck
@@ -0,0 +1 @@
+../../userprog/args-dbl-space.ck
\ No newline at end of file
diff --git a/tests/intro/userprog-args/args-limit.c b/tests/intro/userprog-args/args-limit.c
new file mode 100644
index 0000000..159d868
--- /dev/null
+++ b/tests/intro/userprog-args/args-limit.c
@@ -0,0 +1,70 @@
+/* Test the limit for (1) number of arguments and (2) total size of arguments */
+#include <syscall.h>
+#include <string.h>
+#include "tests/lib.h"
+
+#define MAX_SIZE 4096
+
+static bool recurse (int, int);
+
+char cmd[MAX_SIZE * 4];
+
+static bool
+recurse (int argsize, int argcount)
+{
+  int i, j;
+  char *p;
+  strlcpy (cmd, "args-limit", 11);
+  p = cmd+strlen(cmd);
+  for (i = 0; i < argcount; i++) {
+    *p++ = ' ';
+    for (j = 0; j < argsize; j++) {
+      *p++ = 'X';
+    }
+  }
+  *p = 0;
+  if (wait (exec (cmd)) < 0) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+int
+main (int argc, char **argv)
+{
+  test_name = argv[0];
+  if(argc <= 1) {
+    int step;
+    int max_args = 0, max_size = 0;
+
+    msg ("begin");
+
+    /* Binary search number of arguments */
+    for (step = MAX_SIZE; step > 0 && max_args < MAX_SIZE; step>>=1) {
+      int t = max_args + step;
+      if (recurse (1, t)) {
+        max_args = t;
+      }
+    }
+    if (max_args > 63) {
+      msg ("success. at least 64 command line arguments are supported.");
+    } else {
+      msg ("FAIL: Only %d command line arguments are supported",max_args);
+    }
+    /* Binary search size of arguments */
+    for (step = MAX_SIZE; step > 0 && max_size < MAX_SIZE; step>>=1) {
+      int t = max_size + step;
+      if (recurse (t, 1)) {
+        max_size = t;
+      }
+    }
+    if (max_size >= 100) {
+      msg ("success. arguments with at least 100 bytes are supported.");
+    } else {
+      msg ("FAIL: Arguments with more than %d bytes are not supported.",max_size);
+    }
+    msg ("end");
+  }
+  return 0;
+}
diff --git a/tests/intro/userprog-args/args-limit.ck b/tests/intro/userprog-args/args-limit.ck
new file mode 100644
index 0000000..ed8ead2
--- /dev/null
+++ b/tests/intro/userprog-args/args-limit.ck
@@ -0,0 +1,11 @@
+# -*- perl -*-
+use strict;
+use warnings;
+use tests::tests;
+check_expected (IGNORE_EXIT_CODES => 1, [<<'EOF']);
+(args-limit) begin
+(args-limit) success. at least 64 command line arguments are supported.
+(args-limit) success. arguments with at least 100 bytes are supported.
+(args-limit) end
+EOF
+pass;
diff --git a/tests/intro/userprog-args/args-many.ck b/tests/intro/userprog-args/args-many.ck
new file mode 120000
index 0000000..ed175bd
--- /dev/null
+++ b/tests/intro/userprog-args/args-many.ck
@@ -0,0 +1 @@
+../../userprog/args-many.ck
\ No newline at end of file
diff --git a/tests/intro/userprog-args/args-multiple.ck b/tests/intro/userprog-args/args-multiple.ck
new file mode 120000
index 0000000..4f9935f
--- /dev/null
+++ b/tests/intro/userprog-args/args-multiple.ck
@@ -0,0 +1 @@
+../../userprog/args-multiple.ck
\ No newline at end of file
diff --git a/tests/intro/userprog-args/args-none.ck b/tests/intro/userprog-args/args-none.ck
new file mode 120000
index 0000000..861d319
--- /dev/null
+++ b/tests/intro/userprog-args/args-none.ck
@@ -0,0 +1 @@
+../../userprog/args-none.ck
\ No newline at end of file
diff --git a/tests/intro/userprog-args/args-single.ck b/tests/intro/userprog-args/args-single.ck
new file mode 120000
index 0000000..df8e737
--- /dev/null
+++ b/tests/intro/userprog-args/args-single.ck
@@ -0,0 +1 @@
+../../userprog/args-single.ck
\ No newline at end of file
diff --git a/tests/intro/userprog-args/args.c b/tests/intro/userprog-args/args.c
new file mode 120000
index 0000000..0d798ac
--- /dev/null
+++ b/tests/intro/userprog-args/args.c
@@ -0,0 +1 @@
+../../userprog/args.c
\ No newline at end of file
diff --git a/tests/intro/userprog-args/child-simple.c b/tests/intro/userprog-args/child-simple.c
new file mode 120000
index 0000000..f8a3ce7
--- /dev/null
+++ b/tests/intro/userprog-args/child-simple.c
@@ -0,0 +1 @@
+../../userprog/child-simple.c
\ No newline at end of file