X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fatlocal.in;h=38679c050c1c63f8f5dceb1d540fdab8eeffc404;hb=a4b0d14666d23ed908fd991b7435997436c2d79a;hp=4c2e0efd7f6b354eef954e5146a44b81f56f888c;hpb=b629a618056b7c3b55b1768f4cf138529f20016f;p=pspp

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 4c2e0efd7f..38679c050c 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,11 +1,32 @@
 # -*- shell-script -*-
 
+# PSPP - a program for statistical analysis.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+
 # 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@'
+PACKAGE_STRING='@PACKAGE_STRING@'
+PACKAGE_BUGREPORT='@PACKAGE_BUGREPORT@'
 
 PSQL_SUPPORT='@PSQL_SUPPORT@'
 if test "$PSQL_SUPPORT" = yes; then
@@ -13,6 +34,17 @@ if test "$PSQL_SUPPORT" = yes; then
     : ${PG_DBASE:=pspptest}
     : ${PG_PORT:=6543}
     : ${PG_PATH:=`$PG_CONFIG --bindir`}
+
+    # PSQL_SUPPORT indicates that PSPP was built against the PostgreSQL client
+    # library, but it does not mean that the PostgreSQL utilities are
+    # installed.  So check for them and turn off PSQL_SUPPORT if they are not
+    # available.
+    if (PATH=$PG_PATH:$PATH; export PATH; initdb --version) >/dev/null 2>&1
+    then
+	:
+    else
+	PSQL_SUPPORT=no
+    fi
 fi
 
 # Variables used by programs invoked by the testsuite.
@@ -22,5 +54,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