Commit c9e19b2a authored by guhaoyu2005's avatar guhaoyu2005
Browse files

fixed conflict

parents 0c086d4c d21b0c82
......@@ -90,5 +90,9 @@ do
cat "${ASSIGNMENTDIR}/tests/${fn}.output" >> $LOG
done
rm -rf /kernel/tests
rm -rf /kernel/*.o
rm -rf /kernel/sfssh
exit 0
......@@ -59,6 +59,7 @@ else
cat test.log
fi
rm -f test.log
<<<<<<< HEAD
exit
# Test data/image.20
......@@ -515,3 +516,5 @@ else
cat test.log
fi
rm -f test.log
=======
>>>>>>> orig/master
......@@ -72,6 +72,7 @@ def mark(tests, helpers, t_type, debug=False):
except:
if DEBUG:
print(traceback.format_exc())
cmts.add("Cannot parse assignment log - likely an error in your assignment. Ensure that your output is correctly formated.")
return (f"{t_type} Tests", grade, ",".join(cmts))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment