Hello,
Please find attached "blind" additional fixes for Windows & AIX.
- more nan/inf variants
- different message on non existing user
- illegal vs unrecognized options
I suspect that $windows_os is not true on "bowerbird", in order to fix it
the value of "$Config{osname}" is needed...
--
Fabien.
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index 66df4bc..54a6039 100644
--- a/src/bin/pgbench/t/001_pgbench_with_server.pl
+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -73,7 +73,11 @@ pgbench(
1,
[qr{^$}],
[ qr{connection to database "template0" failed},
- qr{FATAL: role "no-such-user" does not exist} ],
+ # FATAL: role "no-such-user" does not exist
+ # FATAL: SSPI authentication failed for user "no-such-user"
+ qr{FATAL:.* (role|user) "no-such-user"},
+ qr{FATAL:.* (does not exist|authentication failed)}
+ ],
'no such user');
pgbench(
@@ -217,9 +221,9 @@ pgbench(
qr{command=18.: double 18\b},
qr{command=19.: double 19\b},
qr{command=20.: double 20\b},
- qr{command=21.: double -?nan}i,
- qr{command=22.: double inf}i,
- qr{command=23.: double -inf}i,
+ qr{command=21.: double (-?nan|-1\.#IND)}i,
+ qr{command=22.: double (inf|1\.#INF)}i,
+ qr{command=23.: double (-inf|-1\.#INF)}i,
qr{command=24.: int 9223372036854775807\b}, ],
'pgbench expressions',
{ '001_pgbench_expressions' => q{-- integer functions
diff --git a/src/bin/pgbench/t/002_pgbench_no_server.pl b/src/bin/pgbench/t/002_pgbench_no_server.pl
index 631aa73..d6b3d4f 100644
--- a/src/bin/pgbench/t/002_pgbench_no_server.pl
+++ b/src/bin/pgbench/t/002_pgbench_no_server.pl
@@ -26,7 +26,7 @@ my @options = (
# name, options, stderr checks
[ 'bad option',
'-h home -p 5432 -U calvin -d --bad-option',
- [ qr{unrecognized option}, qr{--help.*more information} ] ],
+ [ qr{(unrecognized|illegal) option}, qr{--help.*more information} ] ],
[ 'no file',
'-f no-such-file',
[qr{could not open file "no-such-file":}] ],
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
