|
25 | 25 | '>'=> \$wcstdout, |
26 | 26 | '2>'=> \$wcstderr; |
27 | 27 | chomp$wcstdout; |
28 | | -if ($wcstdoutne'2' ||$wcstderrne'') |
| 28 | +if ($wcstdout!~/^ *2$/ ||$wcstderrne'') |
29 | 29 | { |
| 30 | +note"wc stdout = '$wcstdout'\n"; |
| 31 | +note"wc stderr = '$wcstderr'\n"; |
30 | 32 | planskip_all=>'"wc -l" is needed to run this test'; |
31 | 33 | } |
32 | 34 |
|
@@ -83,17 +85,17 @@ sub do_command |
83 | 85 |
|
84 | 86 | do_command( |
85 | 87 | "SELECT 'test' AS t FROM generate_series(1,24);\n", |
86 | | -qr/^24\r?$/m, |
| 88 | +qr/^ *24\r?$/m, |
87 | 89 | "execute SELECT query that needs pagination"); |
88 | 90 |
|
89 | 91 | do_command( |
90 | 92 | "\\pset expanded\nSELECT generate_series(1,20) as g;\n", |
91 | | -qr/^39\r?$/m, |
| 93 | +qr/^ *39\r?$/m, |
92 | 94 | "execute SELECT query that needs pagination in expanded mode"); |
93 | 95 |
|
94 | 96 | do_command( |
95 | 97 | "\\pset tuples_only off\n\\d+ information_schema.referential_constraints\n", |
96 | | -qr/^\d+\r?$/m, |
| 98 | +qr/^ *\d+\r?$/m, |
97 | 99 | "execute command with footer that needs pagination"); |
98 | 100 |
|
99 | 101 | # send psql an explicit \q to shut it down, else pty won't close properly |
|