From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 15 Nov 2010 05:42:34 +0000 (-0800)
Subject: tests: Only attempt to run PostgreSQL tests if the server is installed.
X-Git-Tag: v0.7.7~137
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0377713833f0de237dc421c2f25215907a5906e4;p=pspp-builds.git

tests: Only attempt to run PostgreSQL tests if the server is installed.

PSQL_SUPPORT only indicates that PSPP was compiled against the PostgreSQL
client library, but the test also requires the PostgreSQL server and
utilities to be installed, so skip the test if they are not.
---

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 4c2e0efd..e64a08e4 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -13,6 +13,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.