Author: lacton
Date: Sat Sep 13 08:16:39 2008
New Revision: 694969
URL: http://svn.apache.org/viewvc?rev=694969&view=rev
Log:
Fixed a side effect that was causing spurious test failures (reloading rjb.rb
caused ENV_JAVA to be reset, leading to failures in java packaging specs)
Modified:
incubator/buildr/trunk/spec/java_spec.rb
Modified: incubator/buildr/trunk/spec/java_spec.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/java_spec.rb?rev=694969&r1=694968&r2=694969&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/java_spec.rb (original)
+++ incubator/buildr/trunk/spec/java_spec.rb Sat Sep 13 08:16:39 2008
@@ -19,6 +19,7 @@
describe ENV, 'JAVA_HOME on OS X' do
before do
@old_home, ENV['JAVA_HOME'] = ENV['JAVA_HOME'], nil
+ @old_env_java = ENV_JAVA
Config::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
end
@@ -35,6 +36,7 @@
after do
ENV['JAVA_HOME'] = @old_home
+ ENV_JAVA = @old_env_java
end
end
end