# HG changeset patch # User Christian Urban # Date 1544817709 0 # Node ID 178438912e5fa655bfdec3c82b195296fa2f575b # Parent 975d34506e88147930f342a55fd93ad853fb4d6a updated diff -r 975d34506e88 -r 178438912e5f marking4/compare --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/marking4/compare Fri Dec 14 20:01:49 2018 +0000 @@ -0,0 +1,18 @@ +#!/bin/sh +###set -e + +trap "exit" INT + +files=${1:-assignment20189-*} + +for sd in $files; do + cd $sd + cp output output1 + #cmp -s output output1 > /dev/null + #if [ $? -eq 1 ]; then + # echo $sd + "is different" + #fi + cd .. +done + + diff -r 975d34506e88 -r 178438912e5f marking4/mk --- a/marking4/mk Fri Dec 14 14:41:54 2018 +0000 +++ b/marking4/mk Fri Dec 14 20:01:49 2018 +0000 @@ -3,7 +3,7 @@ trap "exit" INT -files=${1:-assignment20179-*} +files=${1:-assignment20189-*} for sd in $files; do cd $sd diff -r 975d34506e88 -r 178438912e5f marking4/re_test.sh --- a/marking4/re_test.sh Fri Dec 14 14:41:54 2018 +0000 +++ b/marking4/re_test.sh Fri Dec 14 20:01:49 2018 +0000 @@ -26,7 +26,7 @@ # functional tests function scala_assert { - (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "") # 2> /dev/null 1> /dev/null) + (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null) } function scala_assert_long { diff -r 975d34506e88 -r 178438912e5f marking4/tails --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/marking4/tails Fri Dec 14 20:01:49 2018 +0000 @@ -0,0 +1,19 @@ +#!/bin/sh +###set -e + +trap "exit" INT + +files=${1:-assignment20189-*} + +for sd in $files; do + cd $sd + #echo $sd + marksone=$(( `tail -1 output` )) + markstwo=$(( `tail -1 output1` )) + if [ "$marksone" != "$markstwo" ]; then + echo $sd + "is different" + fi + cd .. +done + +