Browse Source

Fixed rack-ruby, rack-jruby, rails-jruby by adding additional gems to Gemfiles. Fixed benchmarker.py by adding self to class method argument list

tfb 12 years ago
parent
commit
ad6ee87c08
4 changed files with 6 additions and 2 deletions
  1. 2 0
      rack/Gemfile-jruby
  2. 1 1
      rack/Gemfile-ruby
  3. 2 0
      rails/Gemfile-jruby
  4. 1 1
      toolset/benchmark/benchmarker.py

+ 2 - 0
rack/Gemfile-jruby

@@ -4,3 +4,5 @@ gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'warbler', '1.3.6'
 gem 'jruby-jars', '1.7.4'
 gem 'json', '1.7.6'
+gem "rubyzip", "~> 1.0.0"
+gem "zip-zip", "~> 0.1"

+ 1 - 1
rack/Gemfile-ruby

@@ -2,5 +2,5 @@ source 'http://rubygems.org'
 
 gem 'rack', '1.5.1'
 gem 'json', '1.7.6'
-gem 'passenger', '3.9.5.rc3'
+gem 'passenger', '4.0.19'
 gem "unicorn", "4.6.2"

+ 2 - 0
rails/Gemfile-jruby

@@ -6,3 +6,5 @@ gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'warbler', '1.3.6'
 gem 'jruby-jars', '1.7.4'
 gem 'activerecord-jdbcmysql-adapter', '1.2.6'
+gem "rubyzip", "~> 1.0.0"
+gem "zip-zip", "~> 0.1"

+ 1 - 1
toolset/benchmark/benchmarker.py

@@ -639,7 +639,7 @@ class Benchmarker:
   ############################################################
   # __write_intermediate_results
   ############################################################
-  def __write_intermediate_results(test_name,status_message):
+  def __write_intermediate_results(self,test_name,status_message):
     try:
       self.results["completed"][test_name] = status_message
       with open(os.path.join(self.latest_results_directory, 'results.json'), 'w') as f: