aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-04-02 23:10:16 +0300
committerGitHub <noreply@github.com>2019-04-02 23:10:16 +0300
commitb1aa54bb2911ecf0f26391a9b1e0a6cd308913b5 (patch)
tree6ce41b5ac3e03f3cda19ee6dda5669789a5fcedd /run_unittests.py
parentff477d2b3f5ddc582140e6d357e52f1cb1da74ce (diff)
parent6da0df95c11fac6037d421ae8cf80af146d321da (diff)
downloadmeson-b1aa54bb2911ecf0f26391a9b1e0a6cd308913b5.zip
meson-b1aa54bb2911ecf0f26391a9b1e0a6cd308913b5.tar.gz
meson-b1aa54bb2911ecf0f26391a9b1e0a6cd308913b5.tar.bz2
Merge pull request #5197 from mensinda/introDepBugFix
mintro: Fix crash when required is a function (closes #5177)
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 7ceb553..bc28eea 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -3408,7 +3408,7 @@ recommended as it is not supported on some platforms''')
self.assertDictEqual(buildopts_to_find, {})
# Check buildsystem_files
- bs_files = ['meson.build', 'sharedlib/meson.build', 'staticlib/meson.build']
+ bs_files = ['meson.build', 'meson_options.txt', 'sharedlib/meson.build', 'staticlib/meson.build']
bs_files = [os.path.join(testdir, x) for x in bs_files]
self.assertPathListEqual(list(sorted(res['buildsystem_files'])), list(sorted(bs_files)))
@@ -3560,6 +3560,12 @@ recommended as it is not supported on some platforms''')
'conditional': False
},
{
+ 'name': 'bugDep1',
+ 'required': False,
+ 'has_fallback': False,
+ 'conditional': False
+ },
+ {
'name': 'somethingthatdoesnotexist',
'required': True,
'has_fallback': False,