X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile;h=1dd2c87528c43780ac6d6e81335c4efa26496c2b;hb=f24680bd797a891102f9430f54d2f3c2f06d7513;hp=e0e3a6b836f7e20b9a5d9fa07c74e5eb4b618f99;hpb=180b4945beb4d4a274ab640f9a18b88dbc9065a5;p=m6w6%2Fpecl-ci diff --git a/Makefile b/Makefile index e0e3a6b..1dd2c87 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 @@ -130,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); \ @@ -166,9 +165,14 @@ ext: pecl-check pecl $(makdir)/check-packagexml.php package.xml .PHONY: test +test: TESTS ?= tests test: php - REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests - + REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff $(TESTS) +.PHONY: pecl-test +pecl-test: TESTS ?= $(PECL_DIR)/tests +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 $(TESTS) + pharext/%: $(PECL_INI) php | $(srcdir)/../%.ext.phar for phar in $|; do $(bindir)/php $$phar --prefix=$(prefix) --ini=$(PECL_INI); done