database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-24 00:23:06 +03:00
Code Activity

Revert "In the pg_upgrade test suite, don't write to src/test/regress."

Browse Source 
This reverts commit bd1592e857.  It had
multiple defects.

Discussion: https://postgr.es/m/12717.1558304356@sss.pgh.pa.us
This commit is contained in:
Noah Misch
2019-05-19 15:24:42 -07:00
parent d08d880ab4
commit 9518978e22
5 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/msvc/vcregress.pl
View File

@@ -102,13 +102,6 @@ exit 0;
sub installcheck
{
my $schedule = shift || 'serial';
installcheck_internal $schedule;
return;
}
sub installcheck_internal
{
my ($schedule, @EXTRA_REGRESS_OPTS) = @_;
my @args = (
"../../../$Config/pg_regress/pg_regress",
"--dlpath=.",
@@ -118,7 +111,6 @@ sub installcheck_internal
"--encoding=SQL_ASCII",
"--no-locale");
push(@args, $maxconn) if $maxconn;
push(@args, @EXTRA_REGRESS_OPTS);
system(@args);
my $status = $? >> 8;
exit $status if $status;
@@ -554,14 +546,6 @@ sub upgradecheck
$ENV{PATH} = "$bindir;$ENV{PATH}";
my $data = "$tmp_root/data";
$ENV{PGDATA} = "$data.old";
my $outputdir = "$tmp_root/regress";
my @EXTRA_REGRESS_OPTS = ("--outputdir=$outputdir");
rmtree("$outputdir");
mkdir "$outputdir" || die $!;
mkdir "$outputdir/sql" || die $!;
mkdir "$outputdir/expected" || die $!;
mkdir "$outputdir/testtablespace" || die $!;
my $logdir = "$topdir/src/bin/pg_upgrade/log";
(mkdir $logdir || die $!) unless -d $logdir;
print "\nRunning initdb on old cluster\n\n";
@@ -576,7 +560,7 @@ sub upgradecheck
generate_db('', 91, 127, '');
print "\nSetting up data for upgrading\n\n";
installcheck_internal('serial', @EXTRA_REGRESS_OPTS);
installcheck();
# now we can chdir into the source dir
chdir "$topdir/src/bin/pg_upgrade";