summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-31 12:43:06 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-31 12:43:06 +0000
commit11974fc010b9aba4a4fee3ecdfb27003ba36a6eb (patch)
treeaf04e13ee66ad9b16930ac3fefead4bcecc2082f /common.mk
parentc4734308b6d0c7c7fea3705fa2d4af293df2657a (diff)
mjit.c: allow using MJIT header in build directory
when $MJIT_SEARCH_BUILD_DIR is set. If prefix path is owned by root, `make install` needs to be run by root. But in general we don't want to run `make test-all`, and also running `make test-all` currently fails due to permission tests of rdoc and rubygems. Thus, prior to this commit, specifying a prefix like "/usr/local" could mean there was no way to pass test-all. So we should not depend on `make install` for `make test-all`. Thus I reverted r64104 and r64103, and applied this workaround to pass `make test-all` without `make install`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/common.mk b/common.mk
index 34ed94e..858fbb8 100644
--- a/common.mk
+++ b/common.mk
@@ -732,13 +732,10 @@ no-test-testframework: PHONY
test-sample: test-basic # backward compatibility for mswin-build
test: btest-ruby test-knownbug test-basic
-INPLACE_TEST = $(LIBRUBY_RELATIVE:yes=)
# $ make test-all TESTOPTS="--help" displays more detail
# for example, make test-all TESTOPTS="-j2 -v -n test-name -- test-file-name"
test-all: $(TEST_RUNNABLE)-test-all
-# `make test-all` depends on `make install`: Since r62262, test_jit.rb fails if installed MJIT header is not updated
-# and --enable-load-relative is not specified. We don't have solution for this yet. See also: https://bugs.ruby-lang.org/issues/13620
-yes-test-all: programs $(INPLACE_TEST:no=install) PHONY
+yes-test-all: programs PHONY
$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
TESTS_BUILD = mkmf
no-test-all: PHONY