Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7786fe0

Browse files
committed
Reverted47666 and part ofef57b98
This revertsed47666, which ended up adding a second tempoaryinstallation for all 'make check' runs, and reverts the part ofef57b98 that changed the TAP 'prove_check' section, which appears tohave been unintentional to begin with on this branch.Analysis and patch by Noah.
1 parent48c6a1a commit7786fe0

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

‎src/Makefile.global.in

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ endif
5959
endif
6060
else# not PGXS
6161
vpath_build = @vpath_build@
62-
abs_top_builddir = @abs_top_builddir@
6362
abs_top_srcdir = @abs_top_srcdir@
6463

6564
ifneq ($(vpath_build),yes)
@@ -317,19 +316,6 @@ BZIP2= bzip2
317316

318317
# Testing
319318

320-
check: temp-install
321-
322-
.PHONY: temp-install
323-
temp-install:
324-
ifndefNO_TEMP_INSTALL
325-
ifeq ($(MAKELEVEL),0)
326-
rm -rf '$(abs_top_builddir)'/tmp_install
327-
$(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log
328-
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
329-
endif
330-
$(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install >>'$(abs_top_builddir)'/tmp_install/log/install.log || exit; done)
331-
endif
332-
333319
PROVE = @PROVE@
334320
PG_PROVE_FLAGS = -I$(top_srcdir)/src/test/perl/
335321
PROVE_FLAGS = --verbose
@@ -344,10 +330,6 @@ define ld_library_path_var
344330
$(if$(filter$(PORTNAME),darwin),DYLD_LIBRARY_PATH,$(if$(filter$(PORTNAME),aix),LIBPATH,LD_LIBRARY_PATH))
345331
endef
346332

347-
definewith_temp_install
348-
PATH="$(abs_top_builddir)/tmp_install$(bindir):$$PATH"$(call add_to_path,$(ld_library_path_var),$(abs_top_builddir)/tmp_install$(libdir))
349-
endef
350-
351333
ifeq ($(enable_tap_tests),yes)
352334

353335
defineprove_installcheck
@@ -356,7 +338,9 @@ endef
356338

357339
defineprove_check
358340
rm -rf$(CURDIR)/tmp_check/log
359-
cd$(srcdir) && TESTDIR='$(CURDIR)'$(with_temp_install) PGPORT='6$(DEF_PGPORT)' top_builddir='$(CURDIR)/$(top_builddir)'$(PROVE)$(PG_PROVE_FLAGS)$(PROVE_FLAGS) t/*.pl
341+
$(MKDIR_P) tmp_check/log
342+
$(MAKE) -C$(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1
343+
cd$(srcdir) && TESTDIR='$(CURDIR)' PATH="$(CURDIR)/tmp_check/install$(bindir):$$PATH"$(call add_to_path,$(ld_library_path_var),$(CURDIR)/tmp_check/install$(libdir)) top_builddir='$(CURDIR)/$(top_builddir)' PGPORT='6$(DEF_PGPORT)'$(PROVE)$(PG_PROVE_FLAGS)$(PROVE_FLAGS) t/*.pl
360344
endef
361345

362346
else

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp