aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorAndrei Alexeyev <0x416b617269@gmail.com>2018-07-01 19:55:38 +0300
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-07-01 16:55:38 +0000
commitf7f5e2a725d63eb15f627713129bb6c22d573106 (patch)
tree6202837b2e818b706beca2983abb59f1774e6e79 /run_unittests.py
parentdc683218a4dbb099d0da1c46e4e7bfe4f19ad9ce (diff)
downloadmeson-f7f5e2a725d63eb15f627713129bb6c22d573106.zip
meson-f7f5e2a725d63eb15f627713129bb6c22d573106.tar.gz
meson-f7f5e2a725d63eb15f627713129bb6c22d573106.tar.bz2
Don't let build_always take precedence over build_by_default (#3816)
* Don't let build_always take precedence over build_by_default * Test for proper interaction of build_by_default with build_always Fixes #3815
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 8b664a3..0444199 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1122,12 +1122,18 @@ class AllPlatformTests(BasePlatformTests):
testdir = os.path.join(self.common_test_dir, '137 build by default')
self.init(testdir)
self.build()
- genfile = os.path.join(self.builddir, 'generated.dat')
- exe = os.path.join(self.builddir, 'fooprog' + exe_suffix)
- self.assertPathExists(genfile)
- self.assertPathDoesNotExist(exe)
+ genfile1 = os.path.join(self.builddir, 'generated1.dat')
+ genfile2 = os.path.join(self.builddir, 'generated2.dat')
+ exe1 = os.path.join(self.builddir, 'fooprog' + exe_suffix)
+ exe2 = os.path.join(self.builddir, 'barprog' + exe_suffix)
+ self.assertPathExists(genfile1)
+ self.assertPathExists(genfile2)
+ self.assertPathDoesNotExist(exe1)
+ self.assertPathDoesNotExist(exe2)
self.build(target=('fooprog' + exe_suffix))
- self.assertPathExists(exe)
+ self.assertPathExists(exe1)
+ self.build(target=('barprog' + exe_suffix))
+ self.assertPathExists(exe2)
def test_internal_include_order(self):
testdir = os.path.join(self.common_test_dir, '138 include order')