From: Eric Wong <e@80x24.org>
To: sleepy-penguin@bogomips.org
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH] pkg.mk: various updates from other projects
Date: Wed, 4 Jan 2017 18:44:13 +0000 [thread overview]
Message-ID: <20170104184413.25113-1-e@80x24.org> (raw)
* 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
reply other threads:[~2017-01-04 18:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/sleepy_penguin/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170104184413.25113-1-e@80x24.org \
--to=e@80x24.org \
--cc=sleepy-penguin@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).