File tree 2 files changed +3
-3
lines changed
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -301,13 +301,13 @@ PG_PROVE_FLAGS = --ext='.pl' -I $(top_srcdir)/src/test/perl/
301
301
PROVE_FLAGS = --verbose
302
302
303
303
define prove_installcheck
304
- PATH="$(bindir ) :$$PATH" PGPORT='6$(DEF_PGPORT ) ' $(PROVE ) $(PG_PROVE_FLAGS ) $(PROVE_FLAGS )
304
+ cd $( srcdir ) && TESTDIR=' $( CURDIR ) ' PATH="$(bindir ) :$$PATH" PGPORT='6$(DEF_PGPORT ) ' $(PROVE ) $(PG_PROVE_FLAGS ) $(PROVE_FLAGS )
305
305
endef
306
306
307
307
define prove_check
308
308
$(MKDIR_P ) tmp_check/log
309
309
$(MAKE ) -C $(top_builddir ) DESTDIR=$(CURDIR ) /tmp_check/install install >$(CURDIR ) /tmp_check/log/install.log 2>&1
310
- PATH="$(CURDIR ) /tmp_check/install$(bindir ) :$$PATH" PGPORT='6$(DEF_PGPORT ) ' $(PROVE ) $(PG_PROVE_FLAGS ) $(PROVE_FLAGS )
310
+ cd $( srcdir ) && TESTDIR=' $( CURDIR ) ' PATH="$(CURDIR ) /tmp_check/install$(bindir ) :$$PATH" PGPORT='6$(DEF_PGPORT ) ' $(PROVE ) $(PG_PROVE_FLAGS ) $(PROVE_FLAGS )
311
311
endef
312
312
313
313
# Installation.
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ $ENV{PGPORT} = int($ENV{PGPORT}) % 65536;
62
62
63
63
sub tempdir
64
64
{
65
- return File::Temp::tempdir(' testXXXX ' , DIR => cwd(), CLEANUP => 1);
65
+ return File::Temp::tempdir(' tmp_testXXXX ' , DIR => $ENV { TESTDIR } || cwd(), CLEANUP => 1);
66
66
}
67
67
68
68
my ($test_server_datadir , $test_server_logfile );
You can’t perform that action at this time.
0 commit comments