File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 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/
301301PROVE_FLAGS = --verbose
302302
303303define 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 )
305305endef
306306
307307define prove_check
308308$(MKDIR_P ) tmp_check/log
309309$(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 )
311311endef
312312
313313# Installation.
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ $ENV{PGPORT} = int($ENV{PGPORT}) % 65536;
6262
6363sub tempdir
6464{
65- return File::Temp::tempdir(' testXXXX ' , DIR => cwd(), CLEANUP => 1);
65+ return File::Temp::tempdir(' tmp_testXXXX ' , DIR => $ENV { TESTDIR } || cwd(), CLEANUP => 1);
6666}
6767
6868my ($test_server_datadir , $test_server_logfile );
You can’t perform that action at this time.
0 commit comments