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

Commitf669b61

Browse files
committed
Set shared library path for in-tree TAP tests
When the TAP tests are run in-tree (make check), set the shared librarypath using the appropriate environment variable, using a logic similarto pg_regress, so that the right libraries are used.
1 parentd34b48a commitf669b61

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

‎src/Makefile.global.in

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,24 @@ PROVE = @PROVE@
300300
PG_PROVE_FLAGS = --ext='.pl' -I$(top_srcdir)/src/test/perl/
301301
PROVE_FLAGS = --verbose
302302

303+
# prepend to path if already set, else just set it
304+
defineadd_to_path
305+
$(1)='$(if$($(1)),$(2):$$$(1),$(2))'
306+
endef
307+
308+
# platform-specific environment variable to set shared library path
309+
defineld_library_path_var
310+
$(if$(filter$(PORTNAME),darwin),DYLD_LIBRARY_PATH,$(if$(filter$(PORTNAME),aix),LIBPATH,LD_LIBRARY_PATH))
311+
endef
312+
303313
defineprove_installcheck
304314
cd$(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)'$(PROVE)$(PG_PROVE_FLAGS)$(PROVE_FLAGS)
305315
endef
306316

307317
defineprove_check
308318
$(MKDIR_P) tmp_check/log
309319
$(MAKE) -C$(top_builddir) DESTDIR=$(CURDIR)/tmp_check/install install >$(CURDIR)/tmp_check/log/install.log 2>&1
310-
cd$(srcdir) && TESTDIR='$(CURDIR)' PATH="$(CURDIR)/tmp_check/install$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)'$(PROVE)$(PG_PROVE_FLAGS)$(PROVE_FLAGS)
320+
cd$(srcdir) && TESTDIR='$(CURDIR)' PATH="$(CURDIR)/tmp_check/install$(bindir):$$PATH"$(call add_to_path,$(ld_library_path_var),$(CURDIR)/tmp_check/install$(libdir))PGPORT='6$(DEF_PGPORT)'$(PROVE)$(PG_PROVE_FLAGS)$(PROVE_FLAGS)
311321
endef
312322

313323
# Installation.

0 commit comments

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