summaryrefslogtreecommitdiff
path: root/test/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-07 02:49:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-07 02:49:26 +0000
commitf837601cdb32ab25f19f83f0ec2ed840ed225a83 (patch)
tree0b0d43ca45257ba58443ad503025e3d53bfc9ee3 /test/lib
parent92e9f61579d1146758f3f2c31895b4ba959ae0cc (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@65587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/lib')
-rw-r--r--test/lib/jit_support.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
index fa1402e4b4..82f53ec59d 100644
--- a/test/lib/jit_support.rb
+++ b/test/lib/jit_support.rb
@@ -30,6 +30,10 @@ 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'] and !preloadenv.empty?
+ so = "mjit_build_dir.#{RbConfig::CONFIG['SOEXT']}"
+ base_env[preloadenv] = File.realpath(so) rescue nil
+ end
args.unshift(env ? base_env.merge!(env) : base_env)
EnvUtil.invoke_ruby(args,
'', true, true, timeout: timeout,