Merge branch 'master' into truffle-head

jruby · Sep 25, 2015 · 91befe3 · 91befe3
2 parents 519b18d + bfce7bc
commit 91befe3
Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/spec/ruby/core/binding/local_variable_get_spec.rb b/spec/ruby/core/binding/local_variable_get_spec.rb
@@ -3,11 +3,11 @@
 
 ruby_version_is "2.1" do
   describe "Binding#local_variable_get" do
-  	it "reads local variables captured in the binding" do
+    it "reads local variables captured in the binding" do
       a = 42
       bind = binding
       bind.local_variable_get(:a).should == 42
-  	end
+    end
 
     it "raises a NameError for missing variables" do
       bind = BindingSpecs::Demo.new(1).get_empty_binding

diff --git a/spec/truffle/truffle.mspec b/spec/truffle/truffle.mspec
@@ -7,7 +7,7 @@ class MSpecScript
   set :target, File.expand_path("../../../bin/jruby#{windows? ? '.bat' : ''}", __FILE__)
 
   if ARGV[-2..-1] != %w[-t ruby] # No flags for MRI
-    set :flags, %w[-X+T -J-ea -J-Xmx2G]
+    set :flags, %w[-X+T -J-ea -J-esa -J-Xmx2G]
   end
 
   set :language, [

diff --git a/tool/jruby_eclipse b/tool/jruby_eclipse
@@ -27,7 +27,7 @@ bootclasspath = []
 classpath = []
 
 bootclasspath << "#{JRUBY}/lib/jruby.jar"
-bootclasspath << "#{JRUBY}/lib/jruby-stdlib-9.0.0.0-SNAPSHOT.jar"
+classpath << "#{JRUBY}/lib/jruby-stdlib-9.0.0.0-SNAPSHOT.jar"
 if rest.include?('-X+T')
   bootclasspath << TRUFFLEJAR
   classpath << "#{JRUBY}/truffle/build.eclipse"
@@ -37,7 +37,7 @@ end
 args = [java]
 args << "-Djffi.boot.library.path=#{JRUBY}/lib/jni"
 args << "-Xbootclasspath/a:" + bootclasspath.join(':')
-args << "-cp" << classpath.join(':') unless classpath.empty?
+args << "-classpath" << classpath.join(':') unless classpath.empty?
 
 args << "-Djruby.home=#{JRUBY}"
 args << "-Djruby.lib=#{JRUBY}/lib"