X-Git-Url: https://git.m6w6.name/?p=m6w6%2Ftravis-pecl;a=blobdiff_plain;f=Makefile;h=8330ebc090ae9f6355e8f0f3584b6d164f514e2d;hp=d20e6a420344dd344d47b76f844227aabb84ab6e;hb=63c2c573f9ef2893c223d2d1087c198598e85df3;hpb=3529c77d8f6844c8817873490e290e203b9bfc50

diff --git a/Makefile b/Makefile
index d20e6a4..8330ebc 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ prefix ?= $(TMPDIR)/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[
 endif
 exec_prefix ?= $(prefix)
 bindir = $(exec_prefix)/bin
-srcdir := $(prefix)/src
+srcdir = $(prefix)/src
 ifdef TRAVIS_BUILD_DIR
 curdir ?= $(TRAVIS_BUILD_DIR)
 else
@@ -75,6 +75,7 @@ clean:
 .PHONY: check
 check: $(PHP_RELEASES)
 	@if test -z "$(PHP)"; then echo "No php version specified, e.g. PHP=5.6"; exit 1; fi
+	@if test -z "$(PHP_VERSION)"; then echo "No PHP version akin to $(PHP) available"; exit 1; fi
 	if test -d $(srcdir)/php-$(PHP_VERSION)/.git; then cd $(srcdir)/php-$(PHP_VERSION)/; git pull; fi
 
 .PHONY: reconf
@@ -129,8 +130,7 @@ $(PECL_DIR)/config.m4:
 			cd $(PECL_DIR); \
 			git pull; \
 		else \
-			git clone -b $(PECL_VERSION) \
-				$$(dirname $$(git remote get-url $$(git remote)))/$(PECL_EXTENSION) $(PECL_DIR); \
+			git clone https://github.com/$(PECL_EXTENSION) $(PECL_DIR); \
 		fi; \
 	else \
 		mkdir -p $(PECL_DIR); \
@@ -167,7 +167,10 @@ ext: pecl-check pecl
 .PHONY: test
 test: php
 	REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests
-
+.PHONY: pecl-test
+pecl-test: php
+	REPORT_EXIT_STATUS=1 $(bindir)/php $(prefix)/lib/php/build/run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff $(PECL_DIR)/tests
+	
 pharext/%: $(PECL_INI) php | $(srcdir)/../%.ext.phar
 	for phar in $|; do $(bindir)/php $$phar --prefix=$(prefix) --ini=$(PECL_INI); done