X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Flanguage%2Fdata-io%2Fget-data-psql.at;h=6e5b1a0a26015cddb010f2029d9b0c0326975260;hb=dfb0db0d34a420f994125c3f2702dfec6119f845;hp=3096073b03f4a8db7d85348d035ea1ddc1eeeea8;hpb=769186f0a30bc22fe6da1b2c4418689e43cfe55d;p=pspp
diff --git a/tests/language/data-io/get-data-psql.at b/tests/language/data-io/get-data-psql.at
index 3096073b03..6e5b1a0a26 100644
--- a/tests/language/data-io/get-data-psql.at
+++ b/tests/language/data-io/get-data-psql.at
@@ -1,22 +1,22 @@
dnl PSPP - a program for statistical analysis.
dnl Copyright (C) 2017 Free Software Foundation, Inc.
-dnl
+dnl
dnl This program is free software: you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation, either version 3 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
+dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see .
dnl
AT_BANNER([GET DATA /TYPE=PSQL])
-m4_define([INIT_PSQL],
+m4_define([INIT_PSQL],
[AT_SKIP_IF([test "$PSQL_SUPPORT" = no])
PGDATA=`pwd`/cluster
export PGDATA
@@ -30,7 +30,7 @@ m4_define([INIT_PSQL],
trap 'CLEANUP_PSQL' 0
AT_CHECK([PATH=$PG_PATH:$PATH createdb -h "$socket_dir" -p $PG_PORT $PG_DBASE],
[0], [ignore], [ignore])
- AT_DATA([populate.sql],
+ AT_DATA([populate.sql],
[CREATE TABLE empty (a int, b date, c numeric(23, 4));
-- a largeish table to check big queries work ok.
@@ -58,7 +58,7 @@ m4_define([INIT_PSQL],
timestamp timestamp ,
timestamptz timestamptz ,
interval interval ,
- timetz timetz
+ timetz timetz
);
INSERT INTO thing VALUES (
@@ -136,7 +136,7 @@ m4_define([INIT_PSQL],
# normal $PATH works fine though.
if (PATH=$PG_PATH:$PATH psql -V) >/dev/null 2>&1; then
psql () {
- PATH=$PG_PATH:$PATH command psql "$@"
+ PATH=$PG_PATH:$PATH command psql "$$@@"
}
fi
AT_CHECK([psql -h "$socket_dir" -p $PG_PORT $PG_DBASE < populate.sql],
@@ -145,11 +145,12 @@ m4_define([INIT_PSQL],
m4_define([CLEANUP_PSQL], [PATH=$PG_PATH:$PATH pg_ctl stop -W -o "-k $socket_dir -h ''"])
AT_SETUP([GET DATA /TYPE=PSQL])
+AT_KEYWORDS([slow])
INIT_PSQL
dnl Test with an ordinary query.
AT_CHECK([cat > ordinary-query.sps < empty-result.sps < large-result.sps < get-data.sps <