diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-01-17 07:29:40 +0000 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-01-17 07:29:40 +0000 |
commit | adf51b5249e6b1a7a11fc3adcc01ed196d6c9135 (patch) | |
tree | e26d91d17c81c47ec4f3bc4124105539538fbb3c | |
parent | 399e48c865a230e8e13084df6a4302a5cce5e0bc (diff) | |
parent | 0afbb357d05e64b5fb9deace5c3dd9960aff8a81 (diff) | |
download | swig-adf51b5249e6b1a7a11fc3adcc01ed196d6c9135.tar.gz |
Make testdir a generic special directory for testcases that require subdirectories.
Merge branch 'inctest' of https://github.com/ptomulik/swig
-rw-r--r-- | Examples/test-suite/common.mk | 10 | ||||
-rw-r--r-- | Examples/test-suite/inctest.i | 6 | ||||
-rw-r--r-- | Examples/test-suite/testdir/inctest/subdir1/hello.i (renamed from Examples/test-suite/testdir/subdir1/hello.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/testdir/inctest/subdir1/imports.i (renamed from Examples/test-suite/testdir/subdir1/imports.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/testdir/inctest/subdir1/subinc1.i (renamed from Examples/test-suite/testdir/subdir1/subinc1.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/testdir/inctest/subdir2/hello.i (renamed from Examples/test-suite/testdir/subdir2/hello.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/testdir/inctest/subdir2/imports.i (renamed from Examples/test-suite/testdir/subdir2/imports.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/testdir/inctest/subdir2/subinc2.i (renamed from Examples/test-suite/testdir/subdir2/subinc2.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/testdir/inctest/test.i (renamed from Examples/test-suite/testdir/test.i) | 0 |
9 files changed, 8 insertions, 8 deletions
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 index 75d0ec479..75d0ec479 100644 --- a/Examples/test-suite/testdir/subdir1/hello.i +++ b/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 index 4c359914d..4c359914d 100644 --- a/Examples/test-suite/testdir/subdir1/imports.i +++ b/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 index e023b4c2e..e023b4c2e 100644 --- a/Examples/test-suite/testdir/subdir1/subinc1.i +++ b/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 index ed172b1fd..ed172b1fd 100644 --- a/Examples/test-suite/testdir/subdir2/hello.i +++ b/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 index 6a5a1066c..6a5a1066c 100644 --- a/Examples/test-suite/testdir/subdir2/imports.i +++ b/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 index 1218f41fe..1218f41fe 100644 --- a/Examples/test-suite/testdir/subdir2/subinc2.i +++ b/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 index 96a949e48..96a949e48 100644 --- a/Examples/test-suite/testdir/test.i +++ b/Examples/test-suite/testdir/inctest/test.i |