last resort

[m6w6/travis-pecl] / Makefile

diff --git a/Makefile b/Makefile
index 6630634f0b4512543ba6a2f6f8964694c4be7fa6..8330ebc090ae9f6355e8f0f3584b6d164f514e2d 100644 (file)
--- 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,12 +130,11 @@ $(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); \
-               curl -Ss $(PECL_MIRROR)/$(PECL_EXTENSION)$(if $(PECL_VERSION),/$(PECL_VERSION)) \
+               curl -LSs $(PECL_MIRROR)/$(PECL_EXTENSION)$(if $(PECL_VERSION),/$(PECL_VERSION)) \
                        | tar xz --strip-components 1 -C $(PECL_DIR); \
        fi
 
@@ -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