diff options
| author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-31 12:43:06 +0000 |
|---|---|---|
| committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-31 12:43:06 +0000 |
| commit | 11974fc010b9aba4a4fee3ecdfb27003ba36a6eb (patch) | |
| tree | af04e13ee66ad9b16930ac3fefead4bcecc2082f /test | |
| parent | c4734308b6d0c7c7fea3705fa2d4af293df2657a (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 'test')
| -rw-r--r-- | test/lib/jit_support.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index 2ee1329e31..31f62c0a60 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -35,7 +35,8 @@ module JITSupport ] args << '--jit-save-temps' if save_temps args << '-e' << script - args.unshift(env) if env + base_env = { 'MJIT_SEARCH_BUILD_DIR' => 'true' } # workaround to skip requiring `make install` for `make test-all` + args.unshift(env ? base_env.merge!(env) : base_env) EnvUtil.invoke_ruby(args, '', true, true, timeout: timeout, ) |