diff options
author | Anton Luka Šijanec <anton@sijanec.eu> | 2023-11-03 17:30:18 +0100 |
---|---|---|
committer | Anton Luka Šijanec <anton@sijanec.eu> | 2023-11-03 17:30:18 +0100 |
commit | 4e2b6312bae0a9ec4a1b54c6221505dc1ccec304 (patch) | |
tree | 5ce658813f7777b7e5898b448c70d4575515f465 /šola/p1/dn/tj.sh | |
parent | dn02 fix (diff) | |
download | r-4e2b6312bae0a9ec4a1b54c6221505dc1ccec304.tar r-4e2b6312bae0a9ec4a1b54c6221505dc1ccec304.tar.gz r-4e2b6312bae0a9ec4a1b54c6221505dc1ccec304.tar.bz2 r-4e2b6312bae0a9ec4a1b54c6221505dc1ccec304.tar.lz r-4e2b6312bae0a9ec4a1b54c6221505dc1ccec304.tar.xz r-4e2b6312bae0a9ec4a1b54c6221505dc1ccec304.tar.zst r-4e2b6312bae0a9ec4a1b54c6221505dc1ccec304.zip |
Diffstat (limited to 'šola/p1/dn/tj.sh')
-rwxr-xr-x | šola/p1/dn/tj.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/šola/p1/dn/tj.sh b/šola/p1/dn/tj.sh index 5e2cb11..705db03 100755 --- a/šola/p1/dn/tj.sh +++ b/šola/p1/dn/tj.sh @@ -10,7 +10,7 @@ for f in $2/*.in do echo -n "$f ... " uspeh=0 - out=$(timeout 5s /usr/bin/time --quiet -f %E diff --side-by-side <(java $1 < $f) `sed s/in$/out/ <<<$f` 2>&1) && uspeh=1 + out=$(timeout 5s /usr/bin/time --quiet -f %E diff --ignore-trailing-space --side-by-side <(java $1 < $f) `sed s/in$/out/ <<<$f` 2>&1) && uspeh=1 koda=$? if [ $uspeh -eq 0 ] then @@ -19,12 +19,12 @@ do predolg=$(($predolg+1)) echo "PREKORAČEN ČAS 5s!" echo "VHOD:" - cat $f + tac $f | tac else napa=$(($napa+1)) echo "NAPAČEN IZHOD! Čas izvajanja: `tail -n1 <<<$out`" echo "VHOD:" - cat $f + tac $f | tac echo "IZHOD: Levo je vaš izhod, desno je pravilen izhod:" head -n-1 <<<$out fi @@ -32,7 +32,6 @@ do uspelih=$(($uspelih+1)) echo "USPELO! Čas izvajanja: `tail -n1 <<<$out`" fi - echo done echo "uspešnih testov: $uspelih" echo "napačnih izhodov: $napa" |