Added subdir test

5 files changed, 36 insertions, 2 deletions

diff --git a/run_unittests.py b/run_unittests.py
index c8d7f7a04..711621bab 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5013,6 +5013,22 @@ class RewriterTests(BasePlatformTests):
         out = self.extract_test_data(out)
         self.assertDictEqual(out, expected)
 
+    def test_target_subdir(self):
+        self.prime('2 subdirs')
+        out = self.rewrite(self.builddir, os.path.join(self.builddir, 'addSrc.json'))
+        out = self.extract_test_data(out)
+        expected = {
+            'target': {
+                'd3a7449@@something@exe': {'name': 'something', 'sources': ['first.c', 'second.c', 'third.c']}
+            }
+        }
+        self.assertDictEqual(out, expected)
+
+        # Check the written file
+        out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
+        out = self.extract_test_data(out)
+        self.assertDictEqual(out, expected)
+
 class NativeFileTests(BasePlatformTests):
 
     def setUp(self):
diff --git a/test cases/rewrite/2 subdirs/addSrc.json b/test cases/rewrite/2 subdirs/addSrc.json
new file mode 100644
index 000000000..017476c60
--- /dev/null
+++ b/test cases/rewrite/2 subdirs/addSrc.json
@@ -0,0 +1,13 @@
+[
+  {
+    "type": "target",
+    "target": "something",
+    "operation": "src_add",
+    "sources": ["third.c"]
+  },
+  {
+    "type": "target",
+    "target": "something",
+    "operation": "test"
+  }
+]
diff --git a/test cases/rewrite/2 subdirs/info.json b/test cases/rewrite/2 subdirs/info.json
new file mode 100644
index 000000000..01733333f
--- /dev/null
+++ b/test cases/rewrite/2 subdirs/info.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "target",
+    "target": "something",
+    "operation": "test"
+  }
+]
diff --git a/test cases/rewrite/2 subdirs/meson.build b/test cases/rewrite/2 subdirs/meson.build
index 79b7ad738..c7f3fec89 100644
--- a/test cases/rewrite/2 subdirs/meson.build
+++ b/test cases/rewrite/2 subdirs/meson.build
@@ -2,4 +2,3 @@ project('subdir rewrite', 'c')
 
 subdir('sub1')
 subdir('sub2')
-
diff --git a/test cases/rewrite/2 subdirs/sub2/meson.build b/test cases/rewrite/2 subdirs/sub2/meson.build
index 0d92e7f42..44b4075ea 100644
--- a/test cases/rewrite/2 subdirs/sub2/meson.build
+++ b/test cases/rewrite/2 subdirs/sub2/meson.build
@@ -1,2 +1 @@
 executable('something', srcs)
-