aboutsummaryrefslogtreecommitdiff
path: root/unittests/allplatformstests.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-10-27 14:33:54 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-10-27 20:49:28 -0400
commit3902bd4ef15ed1c50b008ba2e0e0dad79ff185f4 (patch)
tree759947ce516bbace38ced0b933492d28b4e81b0d /unittests/allplatformstests.py
parent18e4b3f4f9f343510923fd21a24dd459e199f2d5 (diff)
downloadmeson-3902bd4ef15ed1c50b008ba2e0e0dad79ff185f4.zip
meson-3902bd4ef15ed1c50b008ba2e0e0dad79ff185f4.tar.gz
meson-3902bd4ef15ed1c50b008ba2e0e0dad79ff185f4.tar.bz2
Fix add_install_script() ignoring install_tag
Fixes: #9454
Diffstat (limited to 'unittests/allplatformstests.py')
-rw-r--r--unittests/allplatformstests.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 3443076..aec832a 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -3896,17 +3896,19 @@ class AllPlatformTests(BasePlatformTests):
Path(installpath, 'usr/share/out2.txt'),
}
- def do_install(tags=None):
- extra_args = ['--tags', tags] if tags else []
- self._run(self.meson_command + ['install', '--dry-run', '--destdir', self.installdir] + extra_args, workdir=self.builddir)
+ def do_install(tags, expected_files, expected_scripts):
+ cmd = self.meson_command + ['install', '--dry-run', '--destdir', self.installdir]
+ cmd += ['--tags', tags] if tags else []
+ stdout = self._run(cmd, workdir=self.builddir)
installed = self.read_install_logs()
- return sorted(installed)
-
- self.assertEqual(sorted(expected_devel), do_install('devel'))
- self.assertEqual(sorted(expected_runtime), do_install('runtime'))
- self.assertEqual(sorted(expected_custom), do_install('custom'))
- self.assertEqual(sorted(expected_runtime_custom), do_install('runtime,custom'))
- self.assertEqual(sorted(expected_all), do_install())
+ self.assertEqual(sorted(expected_files), sorted(installed))
+ self.assertEqual(expected_scripts, stdout.count('Running custom install script'))
+
+ do_install('devel', expected_devel, 0)
+ do_install('runtime', expected_runtime, 0)
+ do_install('custom', expected_custom, 1)
+ do_install('runtime,custom', expected_runtime_custom, 1)
+ do_install(None, expected_all, 2)
def test_introspect_install_plan(self):
testdir = os.path.join(self.unit_test_dir, '98 install all targets')