aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-04-27 11:03:50 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2018-04-27 11:09:14 -0400
commit5970f1be3c5299851f4e2c7e70e3f8c9975391ab (patch)
treebbdf0d923225fc39a41288c21270a6ffa048c23b
parent570c108635ca4b895330a6794061014c278886f8 (diff)
downloadmeson-5970f1be3c5299851f4e2c7e70e3f8c9975391ab.zip
meson-5970f1be3c5299851f4e2c7e70e3f8c9975391ab.tar.gz
meson-5970f1be3c5299851f4e2c7e70e3f8c9975391ab.tar.bz2
Passing --bindir twice is fine
Unit test was asserting that "meson --bindir=foo --bindir=bar" must succeed and "meson configure --bindir=foo --bindir=bar" must fail. There should be no difference between those 2 command lines. In this case it's fine to have it twice because there is no ambiguity, second overrides the first, that's done by python's argparse.
-rwxr-xr-xrun_unittests.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py
index fa652a9..204fbfe 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -2060,10 +2060,8 @@ recommended as it can lead to undefined behaviour on some platforms''')
raise Exception('Missing {} value?'.format(arg))
def test_same_dash_option_twice_configure(self):
- with self.assertRaises(subprocess.CalledProcessError) as e:
- self._test_same_option_twice_configure(
- 'bindir', ['--bindir=foo', '--bindir=bar'])
- self.assertIn('Pick one.', e.stderr)
+ self._test_same_option_twice_configure(
+ 'bindir', ['--bindir=foo', '--bindir=bar'])
def test_same_d_option_twice_configure(self):
self._test_same_option_twice_configure(