Modified: trunk/Tools/ChangeLog (225052 => 225053)
--- trunk/Tools/ChangeLog 2017-11-20 17:18:57 UTC (rev 225052)
+++ trunk/Tools/ChangeLog 2017-11-20 21:20:15 UTC (rev 225053)
@@ -1,3 +1,13 @@
+2017-11-20 Stephan Szabo <[email protected]>
+
+ [Win] Update ruby JSC test writer for gigacage changes
+ https://bugs.webkit.org/show_bug.cgi?id=178757
+
+ Reviewed by Keith Miller.
+
+ * Scripts/webkitruby/jsc-stress-test-writer-ruby.rb:
+ Add additionalEnv to ruby test writer Plan
+
2017-11-20 Michael Catanzaro <[email protected]>
Remove ENABLE_ALLINONE_BUILD option
Modified: trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-ruby.rb (225052 => 225053)
--- trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-ruby.rb 2017-11-20 17:18:57 UTC (rev 225052)
+++ trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-ruby.rb 2017-11-20 21:20:15 UTC (rev 225053)
@@ -261,7 +261,7 @@
end
class Plan
- attr_reader :directory, :arguments, :family, :name, :outputHandler, :errorHandler
+ attr_reader :directory, :arguments, :family, :name, :outputHandler, :errorHandler, :additionalEnv
attr_accessor :index
def initialize(directory, arguments, family, name, outputHandler, errorHandler)
@@ -272,6 +272,7 @@
@outputHandler = outputHandler
@errorHandler = errorHandler
@isSlow = !!$runCommandOptions[:isSlow]
+ @additionalEnv = []
end
def shellCommand
@@ -280,7 +281,7 @@
script += "status = nil\n"
script += "Dir.chdir(\"../#{Shellwords.shellescape(@directory.to_s)}\") do\n"
script += " env = {}\n"
- $envVars.each {
+ ($envVars + additionalEnv).each {
|var|
(key, value) = var.split(/=/, 2)
script += " env[\"#{key}\"] = \"#{value}\"\n"
