Fixed test case and setup.py

2 files changed, 4 insertions, 7 deletions

diff --git a/run_unittests.py b/run_unittests.py
index e52a15ec8..cde5589c7 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5018,17 +5018,13 @@ class RewriterTests(BasePlatformTests):
         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)
+        expected = {'name': 'something', 'sources': ['first.c', 'second.c', 'third.c']}
+        self.assertDictEqual(list(out['target'].values())[0], 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)
+        self.assertDictEqual(list(out['target'].values())[0], expected)
 
 class NativeFileTests(BasePlatformTests):
 
diff --git a/setup.py b/setup.py
index f1f2e81c1..f35296030 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,7 @@ from setuptools import setup
 # Other platforms will create bin/meson
 entries = {'console_scripts': ['meson=mesonbuild.mesonmain:main']}
 packages = ['mesonbuild',
+            'mesonbuild.ast',
             'mesonbuild.backend',
             'mesonbuild.compilers',
             'mesonbuild.dependencies',