Split installation process.

[eval.git] / bin / ev

diff --git a/bin/ev b/bin/ev
index 0a462bf40f4a0a56689f85b4641b2847be2c4030..018f2370da93834ee26c209e4c250ec8235649d3 100755 (executable)
--- a/bin/ev
+++ b/bin/ev
@@ -1,3 +1,4 @@
+#!/bin/bash

 # The Evaluator -- Master Control Script
 # (c) 2001 Martin Mares <mj@ucw.cz>
 
 # The Evaluator -- Master Control Script
 # (c) 2001 Martin Mares <mj@ucw.cz>
 


@@ -29,22 +30,23 @@ locate-source
 compile
 
 # Perform the tests
 compile
 
 # Perform the tests

+PTSFILE=$TDIR/points

 for TEST in $TESTS ; do
        (
        [ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
        exec >$TDIR/$TEST.log
 for TEST in $TESTS ; do
        (
        [ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
        exec >$TDIR/$TEST.log

-       PTSFILE=$TDIR/$TEST.pts

        pstart "Test $TEST ($POINTS_PER_TEST points)... "
        echo "Test $TEST ($POINTS_PER_TEST points)"
        pstart "Test $TEST ($POINTS_PER_TEST points)... "
        echo "Test $TEST ($POINTS_PER_TEST points)"

+       echo >>$PTSFILE -n "$TEST "

        if [ ! -f $TDIR/$PROBLEM ] ; then
                echo >$PTSFILE "0 Compile error."
                die "No executable file"
        fi
        if [ ! -f $TDIR/$PROBLEM ] ; then
                echo >$PTSFILE "0 Compile error."
                die "No executable file"
        fi

-       $TEST_RUN_METHOD || exit 0
+       test-run || exit 0

        syntax-check || exit 0
        output-check || exit 0
        echo "Test completed OK ($POINTS_PER_TEST points)"
        syntax-check || exit 0
        output-check || exit 0
        echo "Test completed OK ($POINTS_PER_TEST points)"

-       echo >$PTSFILE "$POINTS_PER_TEST OK"
+       echo >>$PTSFILE "$POINTS_PER_TEST OK"

        pend "OK"
        )
 done
        pend "OK"
        )
 done