diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_upgrade/test.sh | 12 | ||||
| -rw-r--r-- | src/test/regress/input/largeobject.source | 6 | ||||
| -rw-r--r-- | src/test/regress/output/largeobject.source | 6 | ||||
| -rw-r--r-- | src/test/regress/output/largeobject_1.source | 6 | ||||
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 18 |
5 files changed, 38 insertions, 10 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index 66e69b946b4..6d67d9dfc81 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -110,6 +110,18 @@ PGDATA="${BASE_PGDATA}.old" export PGDATA rm -rf "$BASE_PGDATA" "$PGDATA" +# Send installcheck outputs to a private directory. This avoids conflict when +# check-world runs pg_upgrade check concurrently with src/test/regress check. +# To retrieve interesting files after a run, use pattern tmp_check/*/*.diffs. +outputdir="$temp_root/regress" +EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --outputdir=$outputdir" +export EXTRA_REGRESS_OPTS +rm -rf "$outputdir" +mkdir "$outputdir" +mkdir "$outputdir"/sql +mkdir "$outputdir"/expected +mkdir "$outputdir"/testtablespace + logdir=`pwd`/log rm -rf "$logdir" mkdir "$logdir" diff --git a/src/test/regress/input/largeobject.source b/src/test/regress/input/largeobject.source index b7a9d052bde..7e45b1172ad 100644 --- a/src/test/regress/input/largeobject.source +++ b/src/test/regress/input/largeobject.source @@ -203,12 +203,12 @@ END; SELECT lo_export(loid, '@abs_builddir@/results/lotest.txt') FROM lotest_stash_values; -\lo_import 'results/lotest.txt' +\lo_import '@abs_builddir@/results/lotest.txt' \set newloid :LASTOID -- just make sure \lo_export does not barf -\lo_export :newloid 'results/lotest2.txt' +\lo_export :newloid '@abs_builddir@/results/lotest2.txt' -- This is a hack to test that export/import are reversible -- This uses knowledge about the inner workings of large object mechanism @@ -223,7 +223,7 @@ TRUNCATE lotest_stash_values; \lo_unlink :newloid -\lo_import 'results/lotest.txt' +\lo_import '@abs_builddir@/results/lotest.txt' \set newloid_1 :LASTOID diff --git a/src/test/regress/output/largeobject.source b/src/test/regress/output/largeobject.source index e29f5423aa3..761d7ff3015 100644 --- a/src/test/regress/output/largeobject.source +++ b/src/test/regress/output/largeobject.source @@ -385,10 +385,10 @@ SELECT lo_export(loid, '@abs_builddir@/results/lotest.txt') FROM lotest_stash_va 1 (1 row) -\lo_import 'results/lotest.txt' +\lo_import '@abs_builddir@/results/lotest.txt' \set newloid :LASTOID -- just make sure \lo_export does not barf -\lo_export :newloid 'results/lotest2.txt' +\lo_export :newloid '@abs_builddir@/results/lotest2.txt' -- This is a hack to test that export/import are reversible -- This uses knowledge about the inner workings of large object mechanism -- which should not be used outside it. This makes it a HACK @@ -407,7 +407,7 @@ SELECT lo_unlink(loid) FROM lotest_stash_values; TRUNCATE lotest_stash_values; \lo_unlink :newloid -\lo_import 'results/lotest.txt' +\lo_import '@abs_builddir@/results/lotest.txt' \set newloid_1 :LASTOID SELECT lo_from_bytea(0, lo_get(:newloid_1)) AS newloid_2 \gset diff --git a/src/test/regress/output/largeobject_1.source b/src/test/regress/output/largeobject_1.source index 6fd8cbe0980..7de3e7ea6f6 100644 --- a/src/test/regress/output/largeobject_1.source +++ b/src/test/regress/output/largeobject_1.source @@ -385,10 +385,10 @@ SELECT lo_export(loid, '@abs_builddir@/results/lotest.txt') FROM lotest_stash_va 1 (1 row) -\lo_import 'results/lotest.txt' +\lo_import '@abs_builddir@/results/lotest.txt' \set newloid :LASTOID -- just make sure \lo_export does not barf -\lo_export :newloid 'results/lotest2.txt' +\lo_export :newloid '@abs_builddir@/results/lotest2.txt' -- This is a hack to test that export/import are reversible -- This uses knowledge about the inner workings of large object mechanism -- which should not be used outside it. This makes it a HACK @@ -407,7 +407,7 @@ SELECT lo_unlink(loid) FROM lotest_stash_values; TRUNCATE lotest_stash_values; \lo_unlink :newloid -\lo_import 'results/lotest.txt' +\lo_import '@abs_builddir@/results/lotest.txt' \set newloid_1 :LASTOID SELECT lo_from_bytea(0, lo_get(:newloid_1)) AS newloid_2 \gset diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 2aa29ab008c..9fd5f232ec6 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -102,6 +102,13 @@ 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=.", @@ -111,6 +118,7 @@ sub installcheck "--encoding=SQL_ASCII", "--no-locale"); push(@args, $maxconn) if $maxconn; + push(@args, @EXTRA_REGRESS_OPTS); system(@args); my $status = $? >> 8; exit $status if $status; @@ -558,6 +566,14 @@ 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"; @@ -572,7 +588,7 @@ sub upgradecheck generate_db('', 91, 127, ''); print "\nSetting up data for upgrading\n\n"; - installcheck('parallel'); + installcheck_internal('parallel', @EXTRA_REGRESS_OPTS); # now we can chdir into the source dir chdir "$topdir/src/bin/pg_upgrade"; |