diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2014-10-26 09:47:01 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2014-10-26 09:47:01 -0400 |
| commit | 5c3d830e4401a1825207eb18640395112e6ccd6d (patch) | |
| tree | 435aefebdcccc5b440a28244f4dbb5396f6b22cb | |
| parent | 4a54b99e9c3989017fa5717f343cceab09aa5542 (diff) | |
| download | postgresql-5c3d830e4401a1825207eb18640395112e6ccd6d.tar.gz postgresql-5c3d830e4401a1825207eb18640395112e6ccd6d.zip | |
Fix TAP tests with Perl 5.8
The prove program included in Perl 5.8 does not support the --ext
option, so don't use that and use wildcards on the command line instead.
Note that the tests will still all be skipped, because, for instance,
the version of Test::More is too old, but at least the regular
mechanisms for handling that will apply, instead of failing to call
prove altogether.
| -rw-r--r-- | src/Makefile.global.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 0a60a54ca15..b04d0055a35 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -297,7 +297,7 @@ BZIP2 = bzip2 # Testing PROVE = @PROVE@ -PG_PROVE_FLAGS = --ext='.pl' -I $(top_srcdir)/src/test/perl/ +PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/ PROVE_FLAGS = --verbose # prepend to path if already set, else just set it @@ -311,13 +311,13 @@ $(if $(filter $(PORTNAME),darwin),DYLD_LIBRARY_PATH,$(if $(filter $(PORTNAME),ai endef define prove_installcheck -cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/ +cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/*.pl endef define prove_check $(MKDIR_P) tmp_check/log $(MAKE) -C $(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1 -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) t/ +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) t/*.pl endef # Installation. |