From 4f670845ff9ab6c48bcb5f7bf4d4ef6dc3c3064b Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 27 Mar 2012 11:51:08 +0200 Subject: reorganize file structure to match the upstream requirements --- pintos-progos/tests/intro/Grading | 5 -- pintos-progos/tests/intro/alarm-clock/Make.tests | 15 ---- pintos-progos/tests/intro/alarm-clock/Rubric | 7 -- .../tests/intro/alarm-clock/alarm-multiple.ck | 1 - .../tests/intro/alarm-clock/alarm-negative.c | 1 - .../tests/intro/alarm-clock/alarm-negative.ck | 1 - .../tests/intro/alarm-clock/alarm-simultaneous.c | 1 - .../tests/intro/alarm-clock/alarm-simultaneous.ck | 1 - .../tests/intro/alarm-clock/alarm-single.ck | 1 - pintos-progos/tests/intro/alarm-clock/alarm-wait.c | 1 - pintos-progos/tests/intro/alarm-clock/alarm-zero.c | 1 - .../tests/intro/alarm-clock/alarm-zero.ck | 1 - pintos-progos/tests/intro/alarm-clock/tests.c | 80 ---------------------- pintos-progos/tests/intro/userprog-args/Make.tests | 27 -------- pintos-progos/tests/intro/userprog-args/Rubric | 7 -- .../tests/intro/userprog-args/args-dbl-space.ck | 1 - .../tests/intro/userprog-args/args-limit.c | 70 ------------------- .../tests/intro/userprog-args/args-limit.ck | 11 --- .../tests/intro/userprog-args/args-many.ck | 1 - .../tests/intro/userprog-args/args-multiple.ck | 1 - .../tests/intro/userprog-args/args-none.ck | 1 - .../tests/intro/userprog-args/args-single.ck | 1 - pintos-progos/tests/intro/userprog-args/args.c | 1 - .../tests/intro/userprog-args/child-simple.c | 1 - 24 files changed, 238 deletions(-) delete mode 100644 pintos-progos/tests/intro/Grading delete mode 100644 pintos-progos/tests/intro/alarm-clock/Make.tests delete mode 100644 pintos-progos/tests/intro/alarm-clock/Rubric delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-multiple.ck delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-negative.c delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-negative.ck delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-simultaneous.c delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-simultaneous.ck delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-single.ck delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-wait.c delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-zero.c delete mode 120000 pintos-progos/tests/intro/alarm-clock/alarm-zero.ck delete mode 100644 pintos-progos/tests/intro/alarm-clock/tests.c delete mode 100644 pintos-progos/tests/intro/userprog-args/Make.tests delete mode 100644 pintos-progos/tests/intro/userprog-args/Rubric delete mode 120000 pintos-progos/tests/intro/userprog-args/args-dbl-space.ck delete mode 100644 pintos-progos/tests/intro/userprog-args/args-limit.c delete mode 100644 pintos-progos/tests/intro/userprog-args/args-limit.ck delete mode 120000 pintos-progos/tests/intro/userprog-args/args-many.ck delete mode 120000 pintos-progos/tests/intro/userprog-args/args-multiple.ck delete mode 120000 pintos-progos/tests/intro/userprog-args/args-none.ck delete mode 120000 pintos-progos/tests/intro/userprog-args/args-single.ck delete mode 120000 pintos-progos/tests/intro/userprog-args/args.c delete mode 120000 pintos-progos/tests/intro/userprog-args/child-simple.c (limited to 'pintos-progos/tests/intro') diff --git a/pintos-progos/tests/intro/Grading b/pintos-progos/tests/intro/Grading deleted file mode 100644 index b1ff6b8..0000000 --- a/pintos-progos/tests/intro/Grading +++ /dev/null @@ -1,5 +0,0 @@ -# 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/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 -#include -#include - -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/pintos-progos/tests/intro/userprog-args/Make.tests b/pintos-progos/tests/intro/userprog-args/Make.tests deleted file mode 100644 index 6f7a474..0000000 --- a/pintos-progos/tests/intro/userprog-args/Make.tests +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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/pintos-progos/tests/intro/userprog-args/Rubric b/pintos-progos/tests/intro/userprog-args/Rubric deleted file mode 100644 index f5474c5..0000000 --- a/pintos-progos/tests/intro/userprog-args/Rubric +++ /dev/null @@ -1,7 +0,0 @@ -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/pintos-progos/tests/intro/userprog-args/args-dbl-space.ck b/pintos-progos/tests/intro/userprog-args/args-dbl-space.ck deleted file mode 120000 index 730d787..0000000 --- a/pintos-progos/tests/intro/userprog-args/args-dbl-space.ck +++ /dev/null @@ -1 +0,0 @@ -../../userprog/args-dbl-space.ck \ No newline at end of file diff --git a/pintos-progos/tests/intro/userprog-args/args-limit.c b/pintos-progos/tests/intro/userprog-args/args-limit.c deleted file mode 100644 index 159d868..0000000 --- a/pintos-progos/tests/intro/userprog-args/args-limit.c +++ /dev/null @@ -1,70 +0,0 @@ -/* Test the limit for (1) number of arguments and (2) total size of arguments */ -#include -#include -#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/pintos-progos/tests/intro/userprog-args/args-limit.ck b/pintos-progos/tests/intro/userprog-args/args-limit.ck deleted file mode 100644 index ed8ead2..0000000 --- a/pintos-progos/tests/intro/userprog-args/args-limit.ck +++ /dev/null @@ -1,11 +0,0 @@ -# -*- 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/pintos-progos/tests/intro/userprog-args/args-many.ck b/pintos-progos/tests/intro/userprog-args/args-many.ck deleted file mode 120000 index ed175bd..0000000 --- a/pintos-progos/tests/intro/userprog-args/args-many.ck +++ /dev/null @@ -1 +0,0 @@ -../../userprog/args-many.ck \ No newline at end of file diff --git a/pintos-progos/tests/intro/userprog-args/args-multiple.ck b/pintos-progos/tests/intro/userprog-args/args-multiple.ck deleted file mode 120000 index 4f9935f..0000000 --- a/pintos-progos/tests/intro/userprog-args/args-multiple.ck +++ /dev/null @@ -1 +0,0 @@ -../../userprog/args-multiple.ck \ No newline at end of file diff --git a/pintos-progos/tests/intro/userprog-args/args-none.ck b/pintos-progos/tests/intro/userprog-args/args-none.ck deleted file mode 120000 index 861d319..0000000 --- a/pintos-progos/tests/intro/userprog-args/args-none.ck +++ /dev/null @@ -1 +0,0 @@ -../../userprog/args-none.ck \ No newline at end of file diff --git a/pintos-progos/tests/intro/userprog-args/args-single.ck b/pintos-progos/tests/intro/userprog-args/args-single.ck deleted file mode 120000 index df8e737..0000000 --- a/pintos-progos/tests/intro/userprog-args/args-single.ck +++ /dev/null @@ -1 +0,0 @@ -../../userprog/args-single.ck \ No newline at end of file diff --git a/pintos-progos/tests/intro/userprog-args/args.c b/pintos-progos/tests/intro/userprog-args/args.c deleted file mode 120000 index 0d798ac..0000000 --- a/pintos-progos/tests/intro/userprog-args/args.c +++ /dev/null @@ -1 +0,0 @@ -../../userprog/args.c \ No newline at end of file diff --git a/pintos-progos/tests/intro/userprog-args/child-simple.c b/pintos-progos/tests/intro/userprog-args/child-simple.c deleted file mode 120000 index f8a3ce7..0000000 --- a/pintos-progos/tests/intro/userprog-args/child-simple.c +++ /dev/null @@ -1 +0,0 @@ -../../userprog/child-simple.c \ No newline at end of file -- cgit v1.2.3