diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-11-13 18:58:06 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-11-13 18:58:06 (GMT) |
| commit | c2aba592affffdb12d2f95e251ccfc566b6dd674 (patch) | |
| tree | 3f1719afc1ec7408135659f154f4b4072f8b44af /testing/framework/TestCommon.py | |
| parent | ade84bc59db524fbccd670bfadefa786407c7c0b (diff) | |
| parent | 648cf42a89845ccad012e02609ca8958e62ce272 (diff) | |
| download | SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.zip SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.tar.gz SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into subst_rewrite
Diffstat (limited to 'testing/framework/TestCommon.py')
| -rw-r--r-- | testing/framework/TestCommon.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/testing/framework/TestCommon.py b/testing/framework/TestCommon.py index 6b4b0bd..ca4a147 100644 --- a/testing/framework/TestCommon.py +++ b/testing/framework/TestCommon.py @@ -264,11 +264,16 @@ class TestCommon(TestCmd): if options: if arguments is None: return options + + # If not list, then split into lists + # this way we're not losing arguments specified with + # Spaces in quotes. if isinstance(options, str): - options = [options] + options = options.split() if isinstance(arguments, str): - arguments = [arguments] - arguments = ' '.join(options + arguments) + arguments = arguments.split() + arguments = options + arguments + return arguments def must_be_writable(self, *files): |