* [PATCH] pkg.mk: various updates from other projects
@ 2017-01-04 18:44 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2017-01-04 18:44 UTC (permalink / raw)
To: sleepy-penguin; +Cc: Eric Wong
* 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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-01-04 18:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-04 18:44 [PATCH] pkg.mk: various updates from other projects Eric Wong
Code repositories for project(s) associated with this public inbox
https://yhbt.net/sleepy_penguin.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).