From 0afbb357d05e64b5fb9deace5c3dd9960aff8a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= <ptomulik@meil.pw.edu.pl>
Date: Sun, 13 Jan 2013 23:14:46 +0100
Subject: [PATCH] moved testdir/* to testdir/inctest/* under
 Examples/test-suite/

---
 Examples/test-suite/common.mk                          | 10 +++++-----
 Examples/test-suite/inctest.i                          |  6 +++---
 .../test-suite/testdir/{ => inctest}/subdir1/hello.i   |  0
 .../test-suite/testdir/{ => inctest}/subdir1/imports.i |  0
 .../test-suite/testdir/{ => inctest}/subdir1/subinc1.i |  0
 .../test-suite/testdir/{ => inctest}/subdir2/hello.i   |  0
 .../test-suite/testdir/{ => inctest}/subdir2/imports.i |  0
 .../test-suite/testdir/{ => inctest}/subdir2/subinc2.i |  0
 Examples/test-suite/testdir/{ => inctest}/test.i       |  0
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename Examples/test-suite/testdir/{ => inctest}/subdir1/hello.i (100%)
 rename Examples/test-suite/testdir/{ => inctest}/subdir1/imports.i (100%)
 rename Examples/test-suite/testdir/{ => inctest}/subdir1/subinc1.i (100%)
 rename Examples/test-suite/testdir/{ => inctest}/subdir2/hello.i (100%)
 rename Examples/test-suite/testdir/{ => inctest}/subdir2/imports.i (100%)
 rename Examples/test-suite/testdir/{ => inctest}/subdir2/subinc2.i (100%)
 rename Examples/test-suite/testdir/{ => inctest}/test.i (100%)

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 23988404d..173e9b287 100644
--- a/Examples/test-suite/common.mk
+++ b/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 \
diff --git a/Examples/test-suite/inctest.i b/Examples/test-suite/inctest.i
index f33304284..0b01ef4bb 100644
--- a/Examples/test-suite/inctest.i
+++ b/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
diff --git a/Examples/test-suite/testdir/subdir1/hello.i b/Examples/test-suite/testdir/inctest/subdir1/hello.i
similarity index 100%
rename from Examples/test-suite/testdir/subdir1/hello.i
rename to Examples/test-suite/testdir/inctest/subdir1/hello.i
diff --git a/Examples/test-suite/testdir/subdir1/imports.i b/Examples/test-suite/testdir/inctest/subdir1/imports.i
similarity index 100%
rename from Examples/test-suite/testdir/subdir1/imports.i
rename to Examples/test-suite/testdir/inctest/subdir1/imports.i
diff --git a/Examples/test-suite/testdir/subdir1/subinc1.i b/Examples/test-suite/testdir/inctest/subdir1/subinc1.i
similarity index 100%
rename from Examples/test-suite/testdir/subdir1/subinc1.i
rename to Examples/test-suite/testdir/inctest/subdir1/subinc1.i
diff --git a/Examples/test-suite/testdir/subdir2/hello.i b/Examples/test-suite/testdir/inctest/subdir2/hello.i
similarity index 100%
rename from Examples/test-suite/testdir/subdir2/hello.i
rename to Examples/test-suite/testdir/inctest/subdir2/hello.i
diff --git a/Examples/test-suite/testdir/subdir2/imports.i b/Examples/test-suite/testdir/inctest/subdir2/imports.i
similarity index 100%
rename from Examples/test-suite/testdir/subdir2/imports.i
rename to Examples/test-suite/testdir/inctest/subdir2/imports.i
diff --git a/Examples/test-suite/testdir/subdir2/subinc2.i b/Examples/test-suite/testdir/inctest/subdir2/subinc2.i
similarity index 100%
rename from Examples/test-suite/testdir/subdir2/subinc2.i
rename to Examples/test-suite/testdir/inctest/subdir2/subinc2.i
diff --git a/Examples/test-suite/testdir/test.i b/Examples/test-suite/testdir/inctest/test.i
similarity index 100%
rename from Examples/test-suite/testdir/test.i
rename to Examples/test-suite/testdir/inctest/test.i