X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fatlocal.in;h=f011d0849b59671a5770d52af50bcd09010c7669;hb=af52460b4361b4895eb85b42819f8ac1ef57e3fe;hp=9b54a705b4755cbda91b9f46ddce34b1e589a62b;hpb=c58173ea116eed59ce96a4b233f2d2d8ceb50b26;p=pspp

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 9b54a705b4..f011d0849b 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,11 +2,13 @@
 
 # Variables used internally by the testsuite.
 EXEEXT='@EXEEXT@'
-GNM_SUPPORT='@GNM_SUPPORT@'
+GNM_READ_SUPPORT='@GNM_READ_SUPPORT@'
+ODF_READ_SUPPORT='@ODF_READ_SUPPORT@'
 PERL='@PERL@'
 WITH_PERL_MODULE='@WITH_PERL_MODULE@'
 host='@host@'
-SIZEOF_SIZE_T='@SIZEOF_SIZE_T@'
+PACKAGE_STRING='@PACKAGE_STRING@'
+PACKAGE_BUGREPORT='@PACKAGE_BUGREPORT@'
 
 PSQL_SUPPORT='@PSQL_SUPPORT@'
 if test "$PSQL_SUPPORT" = yes; then
@@ -34,5 +36,19 @@ export CHARSETALIASDIR
 GZIP=
 export GZIP
 
+WINEPREFIX=$HOME/.wine    # Work around the following kludge to keep wine happy
+export WINEPREFIX
+
+
 HOME=/nonexistent		# Kluge to make PSPP ignore $HOME/.pspprc.
 export HOME
+
+# Avoids error messages during tests if $TERM is set to an unknown terminal.
+TERM=; unset TERM
+
+pspp_diff=`which diff`
+if test X"$RUNNER" = Xwine; then
+    diff () {
+        $pspp_diff -w  "$@"
+    }
+fi