diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-04-04 13:34:23 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-04-04 13:34:23 -0400 |
| commit | c67a86f7da90c30b81f91957023fb752f06f0598 (patch) | |
| tree | bd92ce9f67ceb19263855f98734d0ed57653881e /src/bin/scripts/t | |
| parent | 368b7c601e3a7ce927602b5399e4b117d71bae31 (diff) | |
| download | postgresql-c67a86f7da90c30b81f91957023fb752f06f0598.tar.gz postgresql-c67a86f7da90c30b81f91957023fb752f06f0598.zip | |
Fix TAP tests to use only standard command-line argument ordering.
Some of the TAP tests were supposing that PG programs would accept switches
after non-switch arguments on their command lines. While GNU getopt_long()
does allow that, our own implementation does not, and it's nowhere
suggested in our documentation that such cases should work. Adjust the
tests to use only the documented syntax.
Back-patch to 9.4, since without this the TAP tests fail when run with
src/port's getopt_long() implementation.
Michael Paquier
Diffstat (limited to 'src/bin/scripts/t')
| -rw-r--r-- | src/bin/scripts/t/010_clusterdb.pl | 2 | ||||
| -rw-r--r-- | src/bin/scripts/t/020_createdb.pl | 2 | ||||
| -rw-r--r-- | src/bin/scripts/t/090_reindexdb.pl | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/scripts/t/010_clusterdb.pl b/src/bin/scripts/t/010_clusterdb.pl index cb9d04b0fe6..dc0d78a27d3 100644 --- a/src/bin/scripts/t/010_clusterdb.pl +++ b/src/bin/scripts/t/010_clusterdb.pl @@ -21,6 +21,6 @@ command_fails([ 'clusterdb', '-t', 'nonexistent', 'postgres' ], psql 'postgres', 'CREATE TABLE test1 (a int); CREATE INDEX test1x ON test1 (a); CLUSTER test1 USING test1x'; issues_sql_like( - [ 'clusterdb', 'postgres', '-t', 'test1' ], + [ 'clusterdb', '-t', 'test1', 'postgres' ], qr/statement: CLUSTER test1;/, 'cluster specific table'); diff --git a/src/bin/scripts/t/020_createdb.pl b/src/bin/scripts/t/020_createdb.pl index 40fbc9278d0..a44283c9458 100644 --- a/src/bin/scripts/t/020_createdb.pl +++ b/src/bin/scripts/t/020_createdb.pl @@ -15,7 +15,7 @@ issues_sql_like( qr/statement: CREATE DATABASE foobar1/, 'SQL CREATE DATABASE run'); issues_sql_like( - [ 'createdb', 'foobar2', '-l', 'C', '-E', 'LATIN1', '-T', 'template0' ], + [ 'createdb', '-l', 'C', '-E', 'LATIN1', '-T', 'template0', 'foobar2' ], qr/statement: CREATE DATABASE foobar2 ENCODING 'LATIN1'/, 'create database with encoding'); diff --git a/src/bin/scripts/t/090_reindexdb.pl b/src/bin/scripts/t/090_reindexdb.pl index d24088ebdbc..d5bce4334e8 100644 --- a/src/bin/scripts/t/090_reindexdb.pl +++ b/src/bin/scripts/t/090_reindexdb.pl @@ -20,18 +20,18 @@ issues_sql_like( psql 'postgres', 'CREATE TABLE test1 (a int); CREATE INDEX test1x ON test1 (a);'; issues_sql_like( - [ 'reindexdb', 'postgres', '-t', 'test1' ], + [ 'reindexdb', '-t', 'test1', 'postgres' ], qr/statement: REINDEX TABLE test1;/, 'reindex specific table'); issues_sql_like( - [ 'reindexdb', 'postgres', '-i', 'test1x' ], + [ 'reindexdb', '-i', 'test1x', 'postgres' ], qr/statement: REINDEX INDEX test1x;/, 'reindex specific index'); issues_sql_like( - [ 'reindexdb', 'postgres', '-S', 'pg_catalog' ], + [ 'reindexdb', '-S', 'pg_catalog', 'postgres' ], qr/statement: REINDEX SCHEMA pg_catalog;/, 'reindex specific schema'); issues_sql_like( - [ 'reindexdb', 'postgres', '-s' ], + [ 'reindexdb', '-s', 'postgres' ], qr/statement: REINDEX SYSTEM postgres;/, 'reindex system tables'); |