ruby-changes:60774
From: Takashi <ko1@a...>
Date: Tue, 14 Apr 2020 15:49:24 +0900 (JST)
Subject: [ruby-changes:60774] f888626552 (master): Fix logic to detect vs120
https://git.ruby-lang.org/ruby.git/commit/?id=f888626552 From f88862655270f47e4ffd84c3eb5a4d62bd99eab1 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Mon, 13 Apr 2020 23:48:39 -0700 Subject: Fix logic to detect vs120 MJIT_CC seems not defined https://ci.appveyor.com/project/ruby/ruby/builds/32161572/job/u5sw8yn4in87heki diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index cc101d6..b26a5fe 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -64,9 +64,9 @@ module JITSupport https://github.com/ruby/ruby/blob/trunk/test/lib/jit_support.rb#L64 # # Until we figure out why, this allows us to skip testing JIT when it happens. def vs120_pdb_corrupted? - return false unless ENV.key?('APPVEYOR') && RbConfig::CONFIG['MJIT_CC'].include?('Microsoft Visual Studio 12.0') + return false unless ENV.key?('APPVEYOR') _stdout, stderr, status = eval_with_jit_without_retry('proc {}.call', verbose: 2, min_calls: 1) - !status.success? && stderr.include?('.pdb is not the pdb file that was used when this precompiled header was created, recreate the precompiled header.') + !status.success? && stderr.include?('x64-mswin64_120') && stderr.include?('.pdb is not the pdb file that was used when this precompiled header was created, recreate the precompiled header.') end def remove_mjit_logs(stderr) -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/