diff options
| author | Eric Wong <e@80x24.org> | 2017-01-04 18:44:13 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2017-01-04 19:04:58 +0000 |
| commit | 6453e9de26956d631e604df7a852cee37e6c8804 (patch) | |
| tree | a719f75787ee6c1883ebf8441f58a2e5af82518a | |
| parent | 955606f586db59066b62763fcd5e9a9599383e0a (diff) | |
| download | sleepy_penguin-6453e9de26956d631e604df7a852cee37e6c8804.tar.gz | |
* 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
| -rw-r--r-- | pkg.mk | 17 |
1 files changed, 5 insertions, 12 deletions
@@ -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 |