Permalink
Browse files

Unbreak test runs on Windows

  • Loading branch information...
vvs committed Jun 11, 2010
1 parent 73a96d6 commit a0e10b55b61aa625083b1cbc6df6f7ed91455bd4
Showing with 10 additions and 4 deletions.
  1. +5 −1 spec/java_integration/ant/ant_spec.rb
  2. +5 −3 spec/java_integration/spec_helper.rb
@@ -4,7 +4,11 @@
before :each do
@previous_java_home = ENV['JAVA_HOME']
- ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.framework/Home'
+ if (WINDOWS)
+ ENV['JAVA_HOME'] = '/C:/java6'
+ else
+ ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.framework/Home'
+ end
@tools_jar = "#{ENV['JAVA_HOME']}/lib/tools.jar"
@classes_zip = "#{ENV['JAVA_HOME']}/lib/classes.zip"
end
@@ -1,10 +1,12 @@
require 'java'
-require File.dirname(__FILE__) + '/../../build/jruby-test-classes.jar'
+require File.expand_path('../../../build/jruby-test-classes.jar', __FILE__)
require 'spec'
Spec::Runner.configure do |config|
- # config.before :each do
- # end
+ config.append_before :suite do
+ require File.expand_path('../../../test/test_helper', __FILE__)
+ include TestHelper
+ end
# config.after :each do
# end

0 comments on commit a0e10b5

Please sign in to comment.