From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6041020754; Wed, 4 Jan 2017 18:44:14 +0000 (UTC) From: Eric Wong To: sleepy-penguin@bogomips.org Cc: Eric Wong Subject: [PATCH] pkg.mk: various updates from other projects Date: Wed, 4 Jan 2017 18:44:13 +0000 Message-Id: <20170104184413.25113-1-e@80x24.org> List-Id: * remove isolate support, we do not use or need it * allow "make check" as an alias for "make test" This is for muscle-memory compatibility with autotool projects * avoid network access during local gem install --- pkg.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkg.mk b/pkg.mk index 9a712ea..186db53 100644 --- a/pkg.mk +++ b/pkg.mk @@ -13,14 +13,6 @@ RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION') RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))') lib := lib -ifeq ($(shell test -f script/isolate_for_tests && echo t),t) -isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/isolate.mk -$(isolate_libs): script/isolate_for_tests - @$(RUBY) script/isolate_for_tests --include $(isolate_libs) -lib := $(lib):$(ISOLATE_LIBS) -endif - ext := $(firstword $(wildcard ext/*)) ifneq ($(ext),) ext_pfx := tmp/ext/$(RUBY_ENGINE)-$(RUBY_VERSION) @@ -94,7 +86,7 @@ fix-perms: gem: $(pkggem) install-gem: $(pkggem) - gem install $(CURDIR)/$< + gem install --local $(CURDIR)/$< $(pkggem): manifest fix-perms gem build $(rfpackage).gemspec @@ -121,9 +113,10 @@ gem install-gem: GIT-VERSION-FILE $(MAKE) $@ VERSION=$(GIT_VERSION) endif -all:: test +all:: check test_units := $(wildcard test/test_*.rb) -test: test-unit +test: check +check: test-unit test-unit: $(test_units) $(test_units): build $(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS) @@ -153,5 +146,5 @@ $(PLACEHOLDERS): echo olddoc_placeholder > $@ endif -.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest +.PHONY: all .FORCE-GIT-VERSION-FILE doc check test $(test_units) manifest .PHONY: check-warnings -- EW