aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorTristan Partin <tristan@partin.io>2021-04-26 11:13:13 -0500
committerGitHub <noreply@github.com>2021-04-26 17:13:13 +0100
commitcc5428488542429f0ffb6e4698bed2c02a4b1ea8 (patch)
tree5c42792bdc7d6b8b412276489465f5a31741cf8f /run_unittests.py
parent39c751b94c5e12bb7a48a64941ccf225d93359ff (diff)
downloadmeson-cc5428488542429f0ffb6e4698bed2c02a4b1ea8.zip
meson-cc5428488542429f0ffb6e4698bed2c02a4b1ea8.tar.gz
meson-cc5428488542429f0ffb6e4698bed2c02a4b1ea8.tar.bz2
Fix issue where multiple dist files were not being produced for comma separated formats value
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py22
1 files changed, 22 insertions, 0 deletions
diff --git a/run_unittests.py b/run_unittests.py
index a0eb670..3faa20c 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -3230,6 +3230,8 @@ class AllPlatformTests(BasePlatformTests):
'''))
xz_distfile = os.path.join(self.distdir, 'disttest-1.4.3.tar.xz')
xz_checksumfile = xz_distfile + '.sha256sum'
+ gz_distfile = os.path.join(self.distdir, 'disttest-1.4.3.tar.gz')
+ gz_checksumfile = gz_distfile + '.sha256sum'
zip_distfile = os.path.join(self.distdir, 'disttest-1.4.3.zip')
zip_checksumfile = zip_distfile + '.sha256sum'
vcs_init(project_dir)
@@ -3243,12 +3245,32 @@ class AllPlatformTests(BasePlatformTests):
self.build('dist')
self.assertPathExists(xz_distfile)
self.assertPathExists(xz_checksumfile)
+ self.assertPathDoesNotExist(gz_distfile)
+ self.assertPathDoesNotExist(gz_checksumfile)
self.assertPathDoesNotExist(zip_distfile)
self.assertPathDoesNotExist(zip_checksumfile)
+ self._run(self.meson_command + ['dist', '--formats', 'gztar'],
+ workdir=self.builddir)
+ self.assertPathExists(gz_distfile)
+ self.assertPathExists(gz_checksumfile)
self._run(self.meson_command + ['dist', '--formats', 'zip'],
workdir=self.builddir)
self.assertPathExists(zip_distfile)
self.assertPathExists(zip_checksumfile)
+ os.remove(xz_distfile)
+ os.remove(xz_checksumfile)
+ os.remove(gz_distfile)
+ os.remove(gz_checksumfile)
+ os.remove(zip_distfile)
+ os.remove(zip_checksumfile)
+ self._run(self.meson_command + ['dist', '--formats', 'xztar,gztar,zip'],
+ workdir=self.builddir)
+ self.assertPathExists(xz_distfile)
+ self.assertPathExists(xz_checksumfile)
+ self.assertPathExists(gz_distfile)
+ self.assertPathExists(gz_checksumfile)
+ self.assertPathExists(zip_distfile)
+ self.assertPathExists(zip_checksumfile)
if include_subprojects:
# Verify that without --include-subprojects we have files from