From 00168cf5a85c68ba5073fa139648179787da882a Mon Sep 17 00:00:00 2001
From: Ryan Hancock <krhancoc@uwaterloo.ca>
Date: Fri, 21 Jan 2022 16:24:53 -0500
Subject: [PATCH] Update scripts
---
install.sh | 5 +++++
os161-container/evaluate.py | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/install.sh b/install.sh
index 96d672c..a1981f0 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 e1db068..93247a9 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
--
GitLab