Revision

3154

Author

vincent.isambart@gmail.com

Date

2009-12-22 17:57:40 -0800 (Tue, 22 Dec 2009)

Log Message

Fixed a few test_vm tests that were incorrect (compared to 1.9)
There are still a few left

Modified Paths

• MacRuby/trunk/test_vm/defined.rb
• MacRuby/trunk/test_vm/dispatch.rb
• MacRuby/trunk/test_vm.rb

Diff

--- MacRuby/trunk/test_vm/defined.rb	2009-12-23 00:42:40 UTC (rev 3153)
+++ MacRuby/trunk/test_vm/defined.rb	2009-12-23 01:57:40 UTC (rev 3154)
@@ -31,4 +31,4 @@
 assert 'nil', "p defined?(yield)"
 
 assert '"expression"', "FOO=42; p (defined? FOO && 42)"
-assert 'nil', "p (defined? FOO && 42)"
+assert '"expression"', "p (defined? FOO && 42)"

--- MacRuby/trunk/test_vm/dispatch.rb	2009-12-23 00:42:40 UTC (rev 3153)
+++ MacRuby/trunk/test_vm/dispatch.rb	2009-12-23 01:57:40 UTC (rev 3154)
@@ -92,11 +92,13 @@
 assert ':ok', %{
   class X
     def method_missing(x, *args, &block)
-      p :ok if x == :foo and block.call == 42
+      p :ko
     end
     
     protected
-    def foo; end
+    def foo
+      p :ok if yield == 42
+    end
   end
   X.new.send(:foo) { 42 }
 }

--- MacRuby/trunk/test_vm.rb	2009-12-23 00:42:40 UTC (rev 3153)
+++ MacRuby/trunk/test_vm.rb	2009-12-23 01:57:40 UTC (rev 3154)
@@ -43,7 +43,7 @@
   archs.each do |arch, commands|
     commands.each do |command|
       output = nil
-      IO.popen(command, 'r+') do |io|
+      IO.popen("#{command} -I.", 'r+') do |io|
         io.puts(code)
         io.close_write
         output = io.read