diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-04-22 14:59:04 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-26 17:05:44 +0100 |
| commit | d4e867809b5b16a4eda0751c7d0148b13b0e35d9 (patch) | |
| tree | d4ad529bec3fc79c57090420aeaa9ae5f10e512c /run_unittests.py | |
| parent | 3af39a463b6d6314136bc944022a99c22bd31b04 (diff) | |
| download | meson-d4e867809b5b16a4eda0751c7d0148b13b0e35d9.zip meson-d4e867809b5b16a4eda0751c7d0148b13b0e35d9.tar.gz meson-d4e867809b5b16a4eda0751c7d0148b13b0e35d9.tar.bz2 | |
store the list of initializes subprojects in the coredata structure
We need to konw on rconfigure which options have already bee set not
just for the super project, but also for the subproject. However, using
first_invocation is not sufficient, as a reconfigure could add a new
subpproject that wasn't present before, and we need to initialize that
project's builtins.
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 905cb8f..b75eb16 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -4321,7 +4321,7 @@ class AllPlatformTests(BasePlatformTests): def test_reconfigure(self): testdir = os.path.join(self.unit_test_dir, '48 reconfigure') - self.init(testdir, extra_args=['-Dopt1=val1']) + self.init(testdir, extra_args=['-Dopt1=val1', '-Dsub1:werror=true']) self.setconf('-Dopt2=val2') self.__reconfigure() @@ -4332,6 +4332,7 @@ class AllPlatformTests(BasePlatformTests): self.assertRegex(out, 'opt2 val2') self.assertRegex(out, 'opt3 val3') self.assertRegex(out, 'opt4 default4') + self.assertRegex(out, 'sub1:werror True') self.build() self.run_tests() @@ -4345,6 +4346,7 @@ class AllPlatformTests(BasePlatformTests): self.assertRegex(out, 'opt2 val2') self.assertRegex(out, 'opt3 val3') self.assertRegex(out, 'opt4 val4') + self.assertRegex(out, 'sub1:werror True') self.assertTrue(Path(self.builddir, '.gitignore').exists()) self.build() self.run_tests() |