From a3e2aa2d66202c6fec84222aba39437b3c3ca2d2 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 4 Feb 2020 21:27:59 +0000 Subject: Fix prefix dependent option defaults (#6552) * Extend test_prefix_dependent_defaults unit test to cover default case Extend test_prefix_dependent_defaults unit test to cover the default case, when the default prefix is '/usr/local'. (On Windows, the default prefix is 'c:/') * Restore adjusting option defaults depending on the default prefix Restore adjusting option defaults, depending on the default prefix. Droppped in d778a371 --- run_unittests.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index cf40955..d0cc68d 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1857,8 +1857,14 @@ class AllPlatformTests(BasePlatformTests): # N.B. We don't check 'libdir' as it's platform dependent, see # default_libdir(): } + + if mesonbuild.mesonlib.default_prefix() == '/usr/local': + expected[None] = expected['/usr/local'] + for prefix in expected: - args = ['--prefix', prefix] + args = [] + if prefix: + args += ['--prefix', prefix] self.init(testdir, extra_args=args, default_args=False) opts = self.introspect('--buildoptions') for opt in opts: -- cgit v1.1