New ASST2 single submitter target and hard linking fix.
This commit is contained in:
parent
196bb3b684
commit
aa4c87a2fa
@ -56,7 +56,7 @@ all-local: $(MYBUILDDIR) .WAIT $(MYBUILDDIR)/$(_LIB_)
|
|||||||
install-staging-local: $(TOOLDIR)/hostlib .WAIT $(TOOLDIR)/hostlib/$(_LIB_)
|
install-staging-local: $(TOOLDIR)/hostlib .WAIT $(TOOLDIR)/hostlib/$(_LIB_)
|
||||||
$(TOOLDIR)/hostlib/$(_LIB_): $(MYBUILDDIR)/$(_LIB_)
|
$(TOOLDIR)/hostlib/$(_LIB_): $(MYBUILDDIR)/$(_LIB_)
|
||||||
rm -f $(.TARGET)
|
rm -f $(.TARGET)
|
||||||
ln $(MYBUILDDIR)/$(_LIB_) $(.TARGET) || \
|
ln $(MYBUILDDIR)/$(_LIB_) $(.TARGET) >/dev/null 2>&1 || \
|
||||||
cp $(MYBUILDDIR)/$(_LIB_) $(.TARGET)
|
cp $(MYBUILDDIR)/$(_LIB_) $(.TARGET)
|
||||||
|
|
||||||
install-local:
|
install-local:
|
||||||
|
@ -76,14 +76,14 @@ cleanhostprog:
|
|||||||
install-staging-local: $(_INSTALLDIR_) .WAIT $(_INSTALLDIR_)/$(_PROG_)
|
install-staging-local: $(_INSTALLDIR_) .WAIT $(_INSTALLDIR_)/$(_PROG_)
|
||||||
$(_INSTALLDIR_)/$(_PROG_): $(MYBUILDDIR)/$(_PROG_)
|
$(_INSTALLDIR_)/$(_PROG_): $(MYBUILDDIR)/$(_PROG_)
|
||||||
rm -f $(.TARGET)
|
rm -f $(.TARGET)
|
||||||
ln $(MYBUILDDIR)/$(_PROG_) $(.TARGET) || \
|
ln $(MYBUILDDIR)/$(_PROG_) $(.TARGET) >/dev/null 2>&1 || \
|
||||||
cp $(MYBUILDDIR)/$(_PROG_) $(.TARGET)
|
cp $(MYBUILDDIR)/$(_PROG_) $(.TARGET)
|
||||||
|
|
||||||
.if defined(HOSTBINDIR)
|
.if defined(HOSTBINDIR)
|
||||||
install-local: install-hostprog
|
install-local: install-hostprog
|
||||||
install-hostprog: $(OSTREE)$(HOSTBINDIR) $(MYBUILDDIR)/$(_PROG_)
|
install-hostprog: $(OSTREE)$(HOSTBINDIR) $(MYBUILDDIR)/$(_PROG_)
|
||||||
rm -f $(OSTREE)$(HOSTBINDIR)/$(_PROG_)
|
rm -f $(OSTREE)$(HOSTBINDIR)/$(_PROG_)
|
||||||
ln $(MYBUILDDIR)/$(_PROG_) $(OSTREE)$(HOSTBINDIR)/$(_PROG_) || \
|
ln $(MYBUILDDIR)/$(_PROG_) $(OSTREE)$(HOSTBINDIR)/$(_PROG_) >/dev/null 2>&1 || \
|
||||||
cp $(MYBUILDDIR)/$(_PROG_) $(OSTREE)$(HOSTBINDIR)/$(_PROG_)
|
cp $(MYBUILDDIR)/$(_PROG_) $(OSTREE)$(HOSTBINDIR)/$(_PROG_)
|
||||||
.else
|
.else
|
||||||
install-local:
|
install-local:
|
||||||
|
@ -59,13 +59,13 @@ all-local: $(MYBUILDDIR) .WAIT $(MYBUILDDIR)/$(_LIB_)
|
|||||||
install-staging-local: $(INSTALLTOP)$(LIBDIR) .WAIT $(INSTALLTOP)$(LIBDIR)/$(_LIB_)
|
install-staging-local: $(INSTALLTOP)$(LIBDIR) .WAIT $(INSTALLTOP)$(LIBDIR)/$(_LIB_)
|
||||||
$(INSTALLTOP)$(LIBDIR)/$(_LIB_): $(MYBUILDDIR)/$(_LIB_)
|
$(INSTALLTOP)$(LIBDIR)/$(_LIB_): $(MYBUILDDIR)/$(_LIB_)
|
||||||
rm -f $(.TARGET)
|
rm -f $(.TARGET)
|
||||||
ln $(MYBUILDDIR)/$(_LIB_) $(.TARGET) || \
|
ln $(MYBUILDDIR)/$(_LIB_) $(.TARGET) >/dev/null 2>&1 || \
|
||||||
cp $(MYBUILDDIR)/$(_LIB_) $(.TARGET)
|
cp $(MYBUILDDIR)/$(_LIB_) $(.TARGET)
|
||||||
|
|
||||||
install-local: $(OSTREE)$(LIBDIR) $(MYBUILDDIR)/$(_LIB_)
|
install-local: $(OSTREE)$(LIBDIR) $(MYBUILDDIR)/$(_LIB_)
|
||||||
@echo "Warning: manually installing library without relinking anything"
|
@echo "Warning: manually installing library without relinking anything"
|
||||||
rm -f $(OSTREE)$(LIBDIR)/$(_LIB_)
|
rm -f $(OSTREE)$(LIBDIR)/$(_LIB_)
|
||||||
ln $(MYBUILDDIR)/$(_LIB_) $(OSTREE)$(LIBDIR)/$(_LIB_) || \
|
ln $(MYBUILDDIR)/$(_LIB_) $(OSTREE)$(LIBDIR)/$(_LIB_) >/dev/null 2>&1 || \
|
||||||
cp $(MYBUILDDIR)/$(_LIB_) $(OSTREE)$(LIBDIR)/$(_LIB_)
|
cp $(MYBUILDDIR)/$(_LIB_) $(OSTREE)$(LIBDIR)/$(_LIB_)
|
||||||
|
|
||||||
# Build the library.
|
# Build the library.
|
||||||
|
@ -44,14 +44,14 @@ install-staging-local: $(INSTALLTOP)$(MANDIR) .WAIT
|
|||||||
install-staging-local: $(INSTALLTOP)$(MANDIR)/$(_F_)
|
install-staging-local: $(INSTALLTOP)$(MANDIR)/$(_F_)
|
||||||
$(INSTALLTOP)$(MANDIR)/$(_F_): $(_F_)
|
$(INSTALLTOP)$(MANDIR)/$(_F_): $(_F_)
|
||||||
rm -f $(.TARGET)
|
rm -f $(.TARGET)
|
||||||
ln $(_F_) $(.TARGET) || cp $(_F_) $(.TARGET)
|
ln $(_F_) $(.TARGET) >/dev/null 2>&1 || cp $(_F_) $(.TARGET)
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
install-local: $(OSTREE)$(MANDIR) .WAIT installmanpages
|
install-local: $(OSTREE)$(MANDIR) .WAIT installmanpages
|
||||||
installmanpages:
|
installmanpages:
|
||||||
.for _F_ in $(MANFILES)
|
.for _F_ in $(MANFILES)
|
||||||
rm -f $(OSTREE)$(MANDIR)/$(_F_)
|
rm -f $(OSTREE)$(MANDIR)/$(_F_)
|
||||||
ln $(_F_) $(OSTREE)$(MANDIR)/$(_F_) || \
|
ln $(_F_) $(OSTREE)$(MANDIR)/$(_F_) >/dev/null 2>&1 || \
|
||||||
cp $(_F_) $(OSTREE)$(MANDIR)/$(_F_)
|
cp $(_F_) $(OSTREE)$(MANDIR)/$(_F_)
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
@ -61,13 +61,13 @@ cleanprog:
|
|||||||
install-staging-local: $(INSTALLTOP)$(BINDIR) .WAIT $(INSTALLTOP)$(BINDIR)/$(PROG)
|
install-staging-local: $(INSTALLTOP)$(BINDIR) .WAIT $(INSTALLTOP)$(BINDIR)/$(PROG)
|
||||||
$(INSTALLTOP)$(BINDIR)/$(PROG): $(MYBUILDDIR)/$(PROG)
|
$(INSTALLTOP)$(BINDIR)/$(PROG): $(MYBUILDDIR)/$(PROG)
|
||||||
rm -f $(.TARGET)
|
rm -f $(.TARGET)
|
||||||
ln $(MYBUILDDIR)/$(PROG) $(.TARGET) || \
|
ln $(MYBUILDDIR)/$(PROG) $(.TARGET) >/dev/null 2>&1 || \
|
||||||
cp $(MYBUILDDIR)/$(PROG) $(.TARGET)
|
cp $(MYBUILDDIR)/$(PROG) $(.TARGET)
|
||||||
|
|
||||||
install-local: install-prog
|
install-local: install-prog
|
||||||
install-prog: $(OSTREE)$(BINDIR) $(MYBUILDDIR)/$(PROG)
|
install-prog: $(OSTREE)$(BINDIR) $(MYBUILDDIR)/$(PROG)
|
||||||
rm -f $(OSTREE)$(BINDIR)/$(PROG)
|
rm -f $(OSTREE)$(BINDIR)/$(PROG)
|
||||||
ln $(MYBUILDDIR)/$(PROG) $(OSTREE)$(BINDIR)/$(PROG) || \
|
ln $(MYBUILDDIR)/$(PROG) $(OSTREE)$(BINDIR)/$(PROG) >/dev/null 2>&1 || \
|
||||||
cp $(MYBUILDDIR)/$(PROG) $(OSTREE)$(BINDIR)/$(PROG)
|
cp $(MYBUILDDIR)/$(PROG) $(OSTREE)$(BINDIR)/$(PROG)
|
||||||
|
|
||||||
# Link the program.
|
# Link the program.
|
||||||
|
51
test161/targets/asst2-single.tt
Normal file
51
test161/targets/asst2-single.tt
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
name: asst2-single
|
||||||
|
print_name: "ASST2 (Single)"
|
||||||
|
description: >
|
||||||
|
In this assignment you will add process and system call support to your
|
||||||
|
OS/161 kernel. This is the single-submitter version for students that are
|
||||||
|
working alone and were provided the file system system calls.
|
||||||
|
leaderboard: false
|
||||||
|
version: 1
|
||||||
|
points: 80
|
||||||
|
type: asst
|
||||||
|
kconfig: ASST2
|
||||||
|
userland: true
|
||||||
|
tests:
|
||||||
|
# Process system call tests (50 points)
|
||||||
|
- id: syscalls/forktest.t
|
||||||
|
points: 15
|
||||||
|
- id: syscalls/shell.t
|
||||||
|
points: 10
|
||||||
|
- id: syscalls/argtest.t
|
||||||
|
points: 5
|
||||||
|
- id: syscalls/bigexec.t
|
||||||
|
points: 10
|
||||||
|
- id: syscalls/factorial.t
|
||||||
|
points: 5
|
||||||
|
- id: syscalls/add.t
|
||||||
|
points: 5
|
||||||
|
# Stability tests (30 points)
|
||||||
|
# Bad calls (5 points)
|
||||||
|
- id: stability/badcall/badcall-execv.t
|
||||||
|
points: 3
|
||||||
|
- id: stability/badcall/badcall-waitpid.t
|
||||||
|
points: 2
|
||||||
|
# crash
|
||||||
|
- id: stability/crash/crash-allS.t
|
||||||
|
points: 3
|
||||||
|
# randcall
|
||||||
|
- id: stability/randcall.t
|
||||||
|
points: 2
|
||||||
|
commands:
|
||||||
|
- id: /testbin/randcall
|
||||||
|
args:
|
||||||
|
- "-f"
|
||||||
|
- "-c 100"
|
||||||
|
- "-r 421"
|
||||||
|
- "2"
|
||||||
|
# forkbomb
|
||||||
|
- id: stability/forkbomb.t
|
||||||
|
points: 10
|
||||||
|
# forktest
|
||||||
|
- id: stability/forktest-stability.t
|
||||||
|
points: 10
|
Loading…
x
Reference in New Issue
Block a user