|
106 | 106 | ISOLATIONCHECK => \&isolationcheck, |
107 | 107 | BINCHECK => \&bincheck, |
108 | 108 | RECOVERYCHECK => \&recoverycheck, |
109 | | - UPGRADECHECK => \&upgradecheck, |
| 109 | + UPGRADECHECK => \&upgradecheck, # no-op |
110 | 110 | TAPTEST => \&taptest,); |
111 | 111 |
|
112 | 112 | my $proc = $command{$what}; |
@@ -286,9 +286,6 @@ sub bincheck |
286 | 286 | foreach my $dir (@bin_dirs) |
287 | 287 | { |
288 | 288 | next unless -d "$dir/t"; |
289 | | - # Do not consider pg_upgrade, as it is handled by |
290 | | - # upgradecheck. |
291 | | - next if ($dir =~ "/pg_upgrade/"); |
292 | 289 |
|
293 | 290 | my $status = tap_check($dir); |
294 | 291 | $mstat ||= $status; |
@@ -498,31 +495,11 @@ sub quote_system_arg |
498 | 495 | return "\"$arg\""; |
499 | 496 | } |
500 | 497 |
|
501 | | -# Generate a database with a name made of a range of ASCII characters, useful |
502 | | -# for testing pg_upgrade. |
503 | | -sub generate_db |
504 | | -{ |
505 | | - my ($prefix, $from_char, $to_char, $suffix) = @_; |
506 | | - |
507 | | - my $dbname = $prefix; |
508 | | - for my $i ($from_char .. $to_char) |
509 | | - { |
510 | | - next if $i == 7 || $i == 10 || $i == 13; # skip BEL, LF, and CR |
511 | | - $dbname = $dbname . sprintf('%c', $i); |
512 | | - } |
513 | | - $dbname .= $suffix; |
514 | | - |
515 | | - system('createdb', quote_system_arg($dbname)); |
516 | | - my $status = $? >> 8; |
517 | | - exit $status if $status; |
518 | | - return; |
519 | | -} |
520 | | - |
521 | 498 | sub upgradecheck |
522 | 499 | { |
523 | | - InstallTemp(); |
524 | | - my $mstat = tap_check("$topdir/src/bin/pg_upgrade"); |
525 | | - exit $mstat if $mstat; |
| 500 | + # pg_upgrade is now handled by bincheck, but keep this target for |
| 501 | + # backward compatibility. |
| 502 | + print "upgradecheck is a no-op, use bincheck instead.\n"; |
526 | 503 | return; |
527 | 504 | } |
528 | 505 |
|
@@ -640,7 +617,7 @@ sub usage |
640 | 617 | " plcheck run tests of PL languages\n", |
641 | 618 | " recoverycheck run recovery test suite\n", |
642 | 619 | " taptest run an arbitrary TAP test set\n", |
643 | | - " upgradecheck run tests of pg_upgrade\n", |
| 620 | + " upgradecheck run tests of pg_upgrade (no-op)\n", |
644 | 621 | "\nOptions for <arg>: (used by check and installcheck)\n", |
645 | 622 | " serial serial mode\n", |
646 | 623 | " parallel parallel mode\n", |
|
0 commit comments