diff --git a/install.sh b/install.sh index 96d672c7f91572c2cbbd1f3f3298e4553560ab59..a1981f0b048cea83af02aabe9a6a53b6453c14ae 100755 --- a/install.sh +++ b/install.sh @@ -1,9 +1,14 @@ #!/usr/bin/env bash +set -e +echo "Updating our own directory" +git pull origin master + echo "Cloning/Updating assignment directory" git clone https://git.uwaterloo.ca/krhancoc/cs350-assignments.git os161-container/assignments > /dev/null 2> /dev/null cd os161-container/assignments > /dev/null git pull origin master > /dev/null 2> /dev/null cd - > /dev/null + echo "Building CS350 container" docker build -t os161-runner ./os161-container diff --git a/os161-container/evaluate.py b/os161-container/evaluate.py index e1db068fd8c872c4f41ed3ae8e8a337b7854286f..93247a9019520ad0417c5d9289eaa9a6b3900306 100755 --- a/os161-container/evaluate.py +++ b/os161-container/evaluate.py @@ -50,8 +50,9 @@ class Report: class Test: def __init__(self, log): log = [l for l in log if len(l) > 0] - self.name = log[0].split("=")[1] - self._log = "\n".join(log[4:]) + self.name = log[0].split("=")[1].strip("<").strip(">") + # Remove the TEST=#### line + self._log = "\n".join(log[1:]) def results(self): return self._log