Modified test cases to enable multiple inheritance mode for Ruby.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4747 626c5289-ae23-0410-ae9c-e8d60b6d4f22

10 files changed, 22 insertions, 24 deletions

diff --git a/Examples/test-suite/abstract_virtual.i b/Examples/test-suite/abstract_virtual.i
index a2794c73a..fd5a79c52 100644
--- a/Examples/test-suite/abstract_virtual.i
+++ b/Examples/test-suite/abstract_virtual.i
@@ -1,7 +1,7 @@
-%module abstract_virtual
+%module(ruby_minherit="1") abstract_virtual
 
-%warnfilter(802, 813) D; /* Ruby, Java multiple inheritance */
-%warnfilter(802, 813) E; /* Ruby, Java multiple inheritance */
+%warnfilter(813) D; /* Ruby, Java multiple inheritance */
+%warnfilter(813) E; /* Ruby, Java multiple inheritance */
 
 %inline %{
   struct A 
diff --git a/Examples/test-suite/default_constructor.i b/Examples/test-suite/default_constructor.i
index 3d9fe8bed..af6d45453 100644
--- a/Examples/test-suite/default_constructor.i
+++ b/Examples/test-suite/default_constructor.i
@@ -1,10 +1,10 @@
 // This module tests default constructor generation under a
 // number of different conditions
 
-%module default_constructor
+%module(ruby_minherit="1") default_constructor
 
-%warnfilter(802, 813) EB; /* Ruby, Java multiple inheritance */
-%warnfilter(802, 813) AD; /* Ruby, Java multiple inheritance */
+%warnfilter(813) EB; /* Ruby, Java multiple inheritance */
+%warnfilter(813) AD; /* Ruby, Java multiple inheritance */
 %warnfilter(510) F; /* friend function */
 
 %inline %{
diff --git a/Examples/test-suite/evil_diamond.i b/Examples/test-suite/evil_diamond.i
index 8644c24c9..e3d0ae898 100644
--- a/Examples/test-suite/evil_diamond.i
+++ b/Examples/test-suite/evil_diamond.i
@@ -1,9 +1,9 @@
-%module evil_diamond
+%module(ruby_minherit="1") evil_diamond
 
 %warnfilter(801) foo;		// Ruby, wrong class name
 %warnfilter(801) bar;		// Ruby, wrong class name
 %warnfilter(801) baz;		// Ruby, wrong class name
-%warnfilter(801,802,813) spam;	// Ruby, wrong class name; Ruby & Java, multiple inheritance
+%warnfilter(801,813) spam;	// Ruby, wrong class name; Ruby & Java, multiple inheritance
 
 %inline %{
 
diff --git a/Examples/test-suite/evil_diamond_ns.i b/Examples/test-suite/evil_diamond_ns.i
index 067805a79..a36b0463b 100644
--- a/Examples/test-suite/evil_diamond_ns.i
+++ b/Examples/test-suite/evil_diamond_ns.i
@@ -1,9 +1,9 @@
-%module evil_diamond_ns
+%module(ruby_minherit="1") evil_diamond_ns
 
 %warnfilter(801) Blah::foo;		// Ruby, wrong class name
 %warnfilter(801) Blah::bar;		// Ruby, wrong class name
 %warnfilter(801) Blah::baz;		// Ruby, wrong class name
-%warnfilter(801,802,813) Blah::spam;	// Ruby, wrong class name; Ruby & Java, multiple inheritance
+%warnfilter(801,813) Blah::spam;	// Ruby, wrong class name; Ruby & Java, multiple inheritance
 
 %inline %{
 namespace Blah {
diff --git a/Examples/test-suite/evil_diamond_prop.i b/Examples/test-suite/evil_diamond_prop.i
index d28a57ca2..083a14a45 100644
--- a/Examples/test-suite/evil_diamond_prop.i
+++ b/Examples/test-suite/evil_diamond_prop.i
@@ -1,9 +1,9 @@
-%module evil_diamond_prop
+%module(ruby_minherit="1") evil_diamond_prop
 
 %warnfilter(801) foo;		// Ruby, wrong class name
 %warnfilter(801) bar;		// Ruby, wrong class name
 %warnfilter(801) baz;		// Ruby, wrong class name
-%warnfilter(801,802,813) spam;	// Ruby, wrong class name; Ruby & Java, multiple inheritance
+%warnfilter(801,813) spam;	// Ruby, wrong class name; Ruby & Java, multiple inheritance
 
 %inline %{
 
diff --git a/Examples/test-suite/pure_virtual.i b/Examples/test-suite/pure_virtual.i
index 1dd148041..a6666c91b 100644
--- a/Examples/test-suite/pure_virtual.i
+++ b/Examples/test-suite/pure_virtual.i
@@ -5,9 +5,7 @@
    as in this file:
 */
 
-%module pure_virtual
-
-%warnfilter(802) E; /* Ruby, multiple inheritance */
+%module(ruby_minherit="1") pure_virtual
 
 %nodefault C;
 %nodefault E;
diff --git a/Examples/test-suite/template_inherit_abstract.i b/Examples/test-suite/template_inherit_abstract.i
index 8cd0b998d..5be3e2fd9 100644
--- a/Examples/test-suite/template_inherit_abstract.i
+++ b/Examples/test-suite/template_inherit_abstract.i
@@ -1,7 +1,7 @@
-%module template_inherit_abstract
+%module(ruby_minherit="1") template_inherit_abstract
 
-%warnfilter(801) oss::test;		/* Ruby, wrong class name */
-%warnfilter(802, 813) oss::Module;	/* Ruby & Java, multiple inheritance */
+%warnfilter(801) oss::test;	/* Ruby, wrong class name */
+%warnfilter(813) oss::Module;	/* Ruby & Java, multiple inheritance */
 
 %inline %{ 
  
diff --git a/Examples/test-suite/using_composition.i b/Examples/test-suite/using_composition.i
index c7cff1d9d..237a08932 100644
--- a/Examples/test-suite/using_composition.i
+++ b/Examples/test-suite/using_composition.i
@@ -1,6 +1,6 @@
-%module using_composition
+%module(ruby_minherit="1") using_composition
 
-%warnfilter(802, 813) FooBar;   // Ruby, Java multiple inheritance
+%warnfilter(813) FooBar;   // Ruby, Java multiple inheritance
 
 %inline %{
 class Foo {
diff --git a/Examples/test-suite/using_extend.i b/Examples/test-suite/using_extend.i
index 8bc670e83..4e2a90077 100644
--- a/Examples/test-suite/using_extend.i
+++ b/Examples/test-suite/using_extend.i
@@ -1,6 +1,6 @@
-%module using_extend
+%module(ruby_minherit="1") using_extend
 
-%warnfilter(802, 813) FooBar;   // Ruby, Java multiple inheritance
+%warnfilter(813) FooBar;   // Ruby, Java multiple inheritance
 
 %extend Foo {
      int blah(int x, int y) {
diff --git a/Examples/test-suite/using_namespace.i b/Examples/test-suite/using_namespace.i
index 886dd2a3e..93c03f098 100644
--- a/Examples/test-suite/using_namespace.i
+++ b/Examples/test-suite/using_namespace.i
@@ -1,9 +1,9 @@
-%module using_namespace
+%module(ruby_minherit="1") using_namespace
 
 %warnfilter(801) hi::hi0;	/* Ruby, wrong class name */
 %warnfilter(801) hi::hi1;	/* Ruby, wrong class name */
 
-%warnfilter(802, 813) Hi<hello::Hello, hi::hi0>; // Ruby, Java multiple inheritance
+%warnfilter(813) Hi<hello::Hello, hi::hi0>; // Ruby, Java multiple inheritance
 
 %inline %{
   namespace hello