From a6ab28b1992cb1afb7f68b2d2b835dc74dd97c88 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 14 Aug 2019 13:04:25 -0700 Subject: run_unittests: extend binary wrapper creater for Wl,--version which is needed by swift. --- run_unittests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/run_unittests.py b/run_unittests.py index 26850b7..6bb6728 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -5950,9 +5950,10 @@ class NativeFileTests(BasePlatformTests): f.write("{}='{}'\n".format(k, v)) return filename - def helper_create_binary_wrapper(self, binary, dir_=None, **kwargs): + def helper_create_binary_wrapper(self, binary, dir_=None, extra_args=None, **kwargs): """Creates a wrapper around a binary that overrides specific values.""" filename = os.path.join(dir_ or self.builddir, 'binary_wrapper{}.py'.format(self.current_wrapper)) + extra_args = extra_args or {} self.current_wrapper += 1 if is_haiku(): chbang = '#!/bin/env python3' @@ -5969,10 +5970,10 @@ class NativeFileTests(BasePlatformTests): def main(): parser = argparse.ArgumentParser() '''.format(chbang))) - for name in kwargs: + for name in chain(extra_args, kwargs): f.write(' parser.add_argument("-{0}", "--{0}", action="store_true")\n'.format(name)) f.write(' args, extra_args = parser.parse_known_args()\n') - for name, value in kwargs.items(): + for name, value in chain(extra_args.items(), kwargs.items()): f.write(' if args.{}:\n'.format(name)) f.write(' print("{}", file=sys.{})\n'.format(value, kwargs.get('outfile', 'stdout'))) f.write(' sys.exit(0)\n') -- cgit v1.1