summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-06 04:13:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-06 04:13:48 +0000
commita39080f59c8bb2ad05beb3381f90354f8117aedb (patch)
tree43ec908f5bf849b5ff187a71f99613036c34ca2a /test
parenta4b73e7e9f9d8cc317be0810e834f202e9ec0f16 (diff)
mjit_build_dir: separate MJIT_BUILD_DIR
* Makefile.in (mjit_build_dir.so): separate MJIT_BUILD_DIR to eliminate the feature for test-all after installation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/lib/jit_support.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
index fa1402e4b4..91e3cf84a5 100644
--- a/test/lib/jit_support.rb
+++ b/test/lib/jit_support.rb
@@ -30,6 +30,12 @@ module JITSupport
args << '--jit-save-temps' if save_temps
args << '-e' << script
base_env = { 'MJIT_SEARCH_BUILD_DIR' => 'true' } # workaround to skip requiring `make install` for `make test-all`
+ if preloadenv = RbConfig::CONFIG['PRELOADENV']
+ so = "mjit_build_dir.#{RbConfig::CONFIG['SOEXT']}"
+ if File.exist?(so)
+ base_env[preloadenv] = so
+ end
+ end
args.unshift(env ? base_env.merge!(env) : base_env)
EnvUtil.invoke_ruby(args,
'', true, true, timeout: timeout,