minhtrannhat/os161
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.ops-class.org:staff/os161

Browse Source
This commit is contained in:
Geoffrey Challen
2016-03-01 14:47:25 -05:00
parent 9f68523cf9 f6c107f839
commit 22b4391203
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
userland/testbin/closetest/closetest.c
View File

@@ -54,7 +54,7 @@ main(int argc, char **argv)
int ret, fd = -1; int ret, fd = -1;
// Try to open a file and then close it // Try to open a file and then close it
fd = open("sys161.conf", O_RDONLY); fd = open("/bin/true", O_RDONLY);
if(fd < 0) { if(fd < 0) {
err(-1, "Open syscall failed"); err(-1, "Open syscall failed");
} }

2
userland/testbin/consoletest/consoletest.c
View File

@@ -53,7 +53,7 @@ main(int argc, char **argv)
(void) argc; (void) argc;
(void) argv; (void) argv;
secprintf(SECRET, "Able was i ere i saw elbA\n", "/testbin/consoletest"); secprintf(SECRET, "Able was i ere i saw elbA", "/testbin/consoletest");
// Guru: Since exit() may not yet be implemented, just trigger a // Guru: Since exit() may not yet be implemented, just trigger a
// failure that the grading scripts expect to see. // failure that the grading scripts expect to see.

3
userland/testbin/randcall/gencalls.sh
View File

@@ -34,6 +34,7 @@ awk < $1 '
printf "#include <stdlib.h>\n"; printf "#include <stdlib.h>\n";
printf "#include <errno.h>\n"; printf "#include <errno.h>\n";
printf "#include <err.h>\n"; printf "#include <err.h>\n";
printf "#include <test161/test161.h>\n";
printf "\n"; printf "\n";
printf "#include \"extern.h\"\n"; printf "#include \"extern.h\"\n";
printf "\n"; printf "\n";
@@ -134,9 +135,11 @@ awk < $1 '
printf "\tfor (i=0; i<count; i++) {\n"; printf "\tfor (i=0; i<count; i++) {\n";
printf "\t\tfor (j=0; list[j]; j++) {\n"; printf "\t\tfor (j=0; list[j]; j++) {\n";
printf "\t\t\tnprintf(\".\");\n";
printf "\t\t\t(*list[j])(dofork);\n"; printf "\t\t\t(*list[j])(dofork);\n";
printf "\t\t}\n"; printf "\t\t}\n";
printf "\t}\n"; printf "\t}\n";
printf "nprintf(\"\\n\");\n";
printf "}\n"; printf "}\n";
printf "\n"; printf "\n";
} }