1.1 --- a/test_all.sh Mon Jan 09 16:01:23 2017 +0100
1.2 +++ b/test_all.sh Mon Jan 09 16:05:35 2017 +0100
1.3 @@ -1,5 +1,8 @@
1.4 #!/bin/sh
1.5
1.6 +LPLC="./lplc"
1.7 +DATADIR="_lplc"
1.8 +
1.9 # Expect failure from the "bad" tests.
1.10
1.11 expect_failure() {
1.12 @@ -11,8 +14,8 @@
1.13
1.14 check_type_warnings() {
1.15
1.16 - if [ -e "_deduced/type_warnings" ] && \
1.17 - [ `stat -c %s "_deduced/type_warnings"` -ne 0 ] ; then
1.18 + if [ -e "$DATADIR/_deduced/type_warnings" ] && \
1.19 + [ `stat -c %s "$DATADIR/_deduced/type_warnings"` -ne 0 ] ; then
1.20
1.21 echo "Type warnings in deduced information." 1>&2
1.22 return 1
1.23 @@ -61,7 +64,7 @@
1.24 # Run tests without an existing cache.
1.25
1.26 echo "$FILENAME..." 1>&2
1.27 - if ! ./lplc "$FILENAME" -r ; then
1.28 + if ! "$LPLC" -c -r "$FILENAME" ; then
1.29 if ! expect_failure; then
1.30 exit 1
1.31 else
1.32 @@ -73,7 +76,7 @@
1.33 # Check for unresolved names in the cache.
1.34
1.35 echo " (depends)..." 1>&2
1.36 - for CACHEFILE in "_cache/"* ; do
1.37 + for CACHEFILE in "$DATADIR/_cache/"* ; do
1.38 STARTLINE=`grep -n '^deferred:' "$CACHEFILE" | cut -d: -f 1`
1.39 if tail -n +$(($STARTLINE + 2)) "$CACHEFILE" | grep -q '<depends>' ; then
1.40 echo "Unresolved names in the cache." 1>&2
1.41 @@ -89,7 +92,7 @@
1.42 # Run tests with an existing cache.
1.43
1.44 echo " (cached)..." 1>&2
1.45 - if ! ./lplc "$FILENAME" ; then exit 1 ; fi
1.46 + if ! "$LPLC" -c "$FILENAME" ; then exit 1 ; fi
1.47
1.48 echo " (warnings)..." 1>&2
1.49 if ! check_type_warnings ; then exit 1 ; fi
1.50 @@ -101,13 +104,13 @@
1.51 OUTLOG="_results/$TESTNAME.out"
1.52
1.53 echo " (build)..." 1>&2
1.54 - if ! make -C _generated clean > "$BUILDLOG" || \
1.55 - ! make -C _generated > "$BUILDLOG" ; then
1.56 + if ! make -C "$DATADIR/_generated" clean > "$BUILDLOG" || \
1.57 + ! make -C "$DATADIR/_generated" > "$BUILDLOG" ; then
1.58 exit 1
1.59 fi
1.60
1.61 echo " (run)..." 1>&2
1.62 - if ! "_generated/main" > "$OUTLOG" < "$TESTINPUT" ; then
1.63 + if ! "$DATADIR/_generated/main" > "$OUTLOG" < "$TESTINPUT" ; then
1.64 exit 1
1.65 fi
1.66 fi