Further fix pg_upgrade crossversion test for adminpack.

The DROP DATABASE step needs an "if exists" option, as the oldest
branches we test don't have the contrib_regression_adminpack DB.
Also remove unnecessary command to drop the extension from the
regression database; no version has installed it there during
buildfarm testing.

Discussion: https://postgr.es/m/0CFB76D0-0510-48B2-9916-1199F93BC28C@yesql.se

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index e4a4dcbd0d2d95269988400ca4bb375a15cb8b28..211b71cb701a8da491dd62ac59a3eea84520d1fd 100644 (file)
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -109,10 +109,8 @@ sub adjust_database_contents
    # we removed the adminpack extension in v17
    if ($old_version < 17)
    {
-       _add_st($result, 'regression',
-           'drop extension if exists adminpack');
        _add_st($result, 'postgres',
-           'drop database contrib_regression_adminpack');
+           'drop database if exists contrib_regression_adminpack');
        delete($dbnames{'contrib_regression_adminpack'});
    }