Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6b531cd

Browse files
committed
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.
1 parent c3c2d98 commit 6b531cd

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Makefile.global.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ BZIP2 = bzip2
297297
# Testing
298298

299299
PROVE = @PROVE@
300-
PG_PROVE_FLAGS = --ext='.pl' -I $(top_srcdir)/src/test/perl/
300+
PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/
301301
PROVE_FLAGS = --verbose
302302

303303
# 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
311311
endef
312312

313313
define prove_installcheck
314-
cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/
314+
cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/*.pl
315315
endef
316316

317317
define prove_check
318318
$(MKDIR_P) tmp_check/log
319319
$(MAKE) -C $(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1
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) t/
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) t/*.pl
321321
endef
322322

323323
# Installation.

0 commit comments

Comments
 (0)