moved testdir/* to testdir/inctest/* under Examples/test-suite/

Examples/test-suite/common.mk

@@ -234,7 +234,7 @@ CPP_TEST_CASES += \
 	inherit_void_arg \
 	inline_initializer \
 	insert_directive \
-        keyword_rename \
+	keyword_rename \
 	kind \
 	langobj \
 	li_attribute \
@@ -281,7 +281,7 @@ CPP_TEST_CASES += \
 	operator_overload \
 	operator_overload_break \
 	operator_pointer_ref \
-        operbool \
+	operbool \
 	ordering \
 	overload_copy \
 	overload_method \
@@ -485,8 +485,8 @@ CPP_STD_TEST_CASES += \
 	li_std_except \
 	li_std_except_as_class \
 	li_std_map \
-        li_std_pair \
-        li_std_pair_using \
+	li_std_pair \
+	li_std_pair_using \
 	li_std_string \
 	li_std_vector \
 	li_std_vector_enum \
@@ -519,7 +519,7 @@ C_TEST_CASES += \
 	immutable_values \
 	inctest \
 	integers \
-        keyword_rename \
+	keyword_rename \
 	lextype \
 	li_carrays \
 	li_cdata \

Examples/test-suite/inctest.i

@@ -4,8 +4,8 @@
  // This test fails if swig is not able to include
  // the following two files:
  //
- //   'testdir/subdir1/hello.i'
- //   'testdir/subdir2/hello.i'
+ //   'testdir/inctest/subdir1/hello.i'
+ //   'testdir/inctest/subdir2/hello.i'
  //
  // since they have the same basename 'hello', swig is only
  // including one. This is not right, it must include both,
@@ -13,7 +13,7 @@
  //
  // Also repeats the test for the import directive in subdirectories
 
-%include "testdir/test.i"
+%include "testdir/inctest/test.i"
 
 
 // Bug #1162194

Examples/test-suite/testdir/inctest/subdir1/hello.i

@@ -0,0 +1,24 @@
+#ifndef subdir1_hello_i_
+#define subdir1_hello_i_
+
+%{
+typedef int Integer;
+%}
+
+%inline %{
+
+  struct A
+  {  
+    int aa;
+  };
+
+  Integer importtest1(Integer i) {
+    return i + 10;
+  }
+
+%}
+  
+
+
+
+#endif //subdir1_hello_i_

Examples/test-suite/testdir/inctest/subdir1/imports.i

@@ -0,0 +1,6 @@
+#ifndef subdir1_imports_i_
+#define subdir1_imports_i_
+
+typedef int Integer;
+
+#endif //subdir1_imports_i_

Examples/test-suite/testdir/inctest/subdir1/subinc1.i

@@ -0,0 +1,5 @@
+// %include twice to check include header guards
+%include "hello.i"
+%include "hello.i"
+%import "imports.i"
+%import "imports.i"

Examples/test-suite/testdir/inctest/subdir2/hello.i

@@ -0,0 +1,24 @@
+#ifndef subdir2_hello_i_
+#define subdir2_hello_i_
+
+%{
+typedef char * TypedefString;
+%}
+
+
+%inline %{
+  
+  struct B
+  {
+    int bb;
+  };
+
+  TypedefString importtest2(TypedefString str) {
+    strcpy(str, "white");
+    return str;
+  }
+
+%}
+
+
+#endif //subdir2_hello_i_

Examples/test-suite/testdir/inctest/subdir2/imports.i

@@ -0,0 +1,6 @@
+#ifndef subdir2_imports_i_
+#define subdir2_imports_i_
+
+typedef char * TypedefString;
+
+#endif //subdir2_imports_i_

Examples/test-suite/testdir/inctest/subdir2/subinc2.i

@@ -0,0 +1,3 @@
+%include "hello.i"
+%import "imports.i"
+

Examples/test-suite/testdir/inctest/test.i

@@ -0,0 +1,4 @@
+
+%include "subdir1/subinc1.i"
+%include "subdir2/subinc2.i"
+