diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-11 19:04:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 19:04:05 +0300 |
| commit | 77bf63d6638cdb3f659cc97179e27d96a85c25a6 (patch) | |
| tree | a81e76e825b9af4094a5377fceebde8913c00657 /run_unittests.py | |
| parent | 27554e9eb13c00efcc1427e9d895809365cdc9bf (diff) | |
| parent | db199b06e65ddb1dc3cb674cad31d872b60aee56 (diff) | |
| download | meson-77bf63d6638cdb3f659cc97179e27d96a85c25a6.zip meson-77bf63d6638cdb3f659cc97179e27d96a85c25a6.tar.gz meson-77bf63d6638cdb3f659cc97179e27d96a85c25a6.tar.bz2 | |
Merge pull request #2291 from centricular/fix-custom-target-includes-ordering
backends: Add custom target inc dirs before target inc dirs
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py index 08ec774..6487496 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -899,7 +899,7 @@ class AllPlatformTests(BasePlatformTests): raise Exception('Could not find someexe and somfxe commands') # Check include order for 'someexe' incs = [a for a in shlex.split(execmd) if a.startswith("-I")] - self.assertEqual(len(incs), 8) + self.assertEqual(len(incs), 9) # target private dir self.assertPathEqual(incs[0], "-Isub4/someexe@exe") # target build subdir @@ -916,6 +916,8 @@ class AllPlatformTests(BasePlatformTests): self.assertPathEqual(incs[6], "-Isub1") # target internal dependency include_directories: source dir self.assertPathBasenameEqual(incs[7], 'sub1') + # custom target include dir + self.assertPathEqual(incs[8], '-Ictsub') # Check include order for 'somefxe' incs = [a for a in shlex.split(fxecmd) if a.startswith('-I')] self.assertEqual(len(incs), 9) |