summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-29 11:00:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-29 11:00:02 +0000
commit93d74cffa096811c1c67525745b4db4e7e2f04e5 (patch)
tree35104cf7d86678e1da8caf74e41a7b1d02467133
parentb4705a52d69fbc92780cb61a99ba6e2041736f17 (diff)
common.mk: install for test-all iff load-relative is disabled
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index caf04fe678..34ed94eaa5 100644
--- a/common.mk
+++ b/common.mk
@@ -732,12 +732,13 @@ 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 install PHONY
+yes-test-all: programs $(INPLACE_TEST:no=install) PHONY
$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
TESTS_BUILD = mkmf
no-test-all: PHONY