Fixed rba basic testsuite when both modes are used.

testdata/ruby/basic_testcore.rb

@@ -1,81 +1,8 @@
 # encoding: UTF-8
 
-# extend A
-class RBA::A 
-
-  alias_method :org_initialize, :initialize
-
-  def initialize(*args)
-    org_initialize(*args)
-    @offset = nil
-  end
-  def s( o )
-    @offset = o
-  end
-  def g
-    return @offset
-  end
-  def m
-    return @offset+a1
-  end
-  def call_a10_prot(f)
-    a10_prot(f)
-  end
-  def inspect
-    if @offset 
-      @offset.to_s
-    else
-      "a1=" + self.a1.to_s
-    end 
-  end
-
-private
-  @offset
-
-end
-
-class MyException < RuntimeError
-  def initialize(s)
-    super(s)
-  end
-end
-    
-class XEdge < RBA::Edge
-  def initialize
-    super(RBA::Point.new(1,2), RBA::Point.new(3,4))
-  end
-end
-
-class RBA::E
-  def m 
-    @m
-  end
-  def m=(x)
-    @m = x
-  end
-  @m = nil
-end
-
-class RBAGObject < RBA::GObject
-  def initialize(z)
-    super()
-    @z = z
-  end
-  # reimplementation of "virtual int g()"
-  def g
-    return @z*2
-  end
-end
-
-class RBAGFactory < RBA::GFactory
-  def initialize
-    super()
-  end
-  # reimplementation of "virtual GObject *f(int)"
-  def f(z)
-    return RBAGObject::new(z)
-  end
-end
+# NOTE: we need to do a "require" here since basic_testcore_defs.rb is not
+# safe in multiple inclusions
+require File.expand_path('../basic_testcore_defs', __FILE__)
 
 class Basic_TestClass < TestBase
 

testdata/ruby/basic_testcore_defs.rb

@@ -0,0 +1,78 @@
+
+# extend A
+class RBA::A 
+
+  alias_method :org_initialize, :initialize
+
+  def initialize(*args)
+    org_initialize(*args)
+    @offset = nil
+  end
+  def s( o )
+    @offset = o
+  end
+  def g
+    return @offset
+  end
+  def m
+    return @offset+a1
+  end
+  def call_a10_prot(f)
+    a10_prot(f)
+  end
+  def inspect
+    if @offset 
+      @offset.to_s
+    else
+      "a1=" + self.a1.to_s
+    end 
+  end
+
+private
+  @offset
+
+end
+
+class MyException < RuntimeError
+  def initialize(s)
+    super(s)
+  end
+end
+    
+class XEdge < RBA::Edge
+  def initialize
+    super(RBA::Point.new(1,2), RBA::Point.new(3,4))
+  end
+end
+
+class RBA::E
+  def m 
+    @m
+  end
+  def m=(x)
+    @m = x
+  end
+  @m = nil
+end
+
+class RBAGObject < RBA::GObject
+  def initialize(z)
+    super()
+    @z = z
+  end
+  # reimplementation of "virtual int g()"
+  def g
+    return @z*2
+  end
+end
+
+class RBAGFactory < RBA::GFactory
+  def initialize
+    super()
+  end
+  # reimplementation of "virtual GObject *f(int)"
+  def f(z)
+    return RBAGObject::new(z)
+  end
+end
+