From 11974fc010b9aba4a4fee3ecdfb27003ba36a6eb Mon Sep 17 00:00:00 2001 From: k0kubun Date: Tue, 31 Jul 2018 12:43:06 +0000 Subject: 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 --- common.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 34ed94eaa5..858fbb8047 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 -- cgit v1.2.3