Reworked the installation machinery.

[eval.git] / bin / lib

diff --git a/bin/lib b/bin/lib
index 7eed64eb9736f6953a98300b6a53b55fde314644..588cf269b5c4ec98522cc59a5bfaf9f36e5ae487 100644 (file)
--- a/bin/lib
+++ b/bin/lib
@@ -202,7 +202,8 @@ function test-prolog
                        ;;
                stdio)  echo "Input file: <stdin> (from $PDIR/$TEST.in)"
                        ln $PDIR/$TEST.in $TDIR/$TEST.in
                        ;;
                stdio)  echo "Input file: <stdin> (from $PDIR/$TEST.in)"
                        ln $PDIR/$TEST.in $TDIR/$TEST.in

-                       BOX_EXTRAS="$BOX_EXTRAS -i$TDIR/$TEST.in"
+                       cp $PDIR/$TEST.in $BOXDIR/.stdin
+                       BOX_EXTRAS="$BOX_EXTRAS -i.stdin"

                        ;;
                none)   echo "Input file: <none>"
                        ;;
                        ;;
                none)   echo "Input file: <none>"
                        ;;


@@ -214,7 +215,7 @@ function test-prolog
                        BOX_EXTRAS="$BOX_EXTRAS -o/dev/null"
                        ;;
                stdio)  echo "Output file: <stdout>"
                        BOX_EXTRAS="$BOX_EXTRAS -o/dev/null"
                        ;;
                stdio)  echo "Output file: <stdout>"

-                       BOX_EXTRAS="$BOX_EXTRAS -o$TDIR/$TEST.out"
+                       BOX_EXTRAS="$BOX_EXTRAS -o.stdout"

                        ;;
                none)   echo "Output file: <none>"
                        ;;
                        ;;
                none)   echo "Output file: <none>"
                        ;;


@@ -236,7 +237,8 @@ function test-epilog
                file)   [ -f $BOXDIR/$PROBLEM.out ] || test-result 0 "No output file."
                        cp $BOXDIR/$PROBLEM.out $TDIR/$TEST.out
                        ;;
                file)   [ -f $BOXDIR/$PROBLEM.out ] || test-result 0 "No output file."
                        cp $BOXDIR/$PROBLEM.out $TDIR/$TEST.out
                        ;;

-               stdio)  [ -f $TDIR/$TEST.out ] || test-result 0 "No output file."
+               stdio)  [ -f $BOXDIR/.stdout ] || test-result 0 "No output file."
+                       cp $BOXDIR/.stdout $TDIR/$TEST.out

                        ;;
        esac
 }
                        ;;
        esac
 }


@@ -319,8 +321,8 @@ function output-check
 
 function public-setup
 {
 
 function public-setup
 {

-       HDIR=$MO_PUBLIC
-       PDIR=$MO_PUBLIC/problems/$PROBLEM
+       HDIR=$MO_ROOT
+       PDIR=$MO_ROOT/problems/$PROBLEM

        SDIR=.
        TDIR=~/.test
        TMPDIR=~/.test
        SDIR=.
        TDIR=~/.test
        TMPDIR=~/.test


@@ -332,7 +334,7 @@ function public-setup
        BOXDIR=~/.box
        mkdir -p $BOXDIR
        rm -rf $BOXDIR/*
        BOXDIR=~/.box
        mkdir -p $BOXDIR
        rm -rf $BOXDIR/*

-       BOXCMD="$MO_PUBLIC/bin/box -c$BOXDIR"
+       BOXCMD="$MO_ROOT/bin/box -c$BOXDIR"

        exec >log
        pend "OK  (see 'log' for details)"
 }
        exec >log
        pend "OK  (see 'log' for details)"
 }