Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add short option fix for #3798, fix bug in test/SCONSFLAGS.py, fix space issue from #3436 #3799

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
Added a bit more arg/target testing
Dillan Mills committed Sep 20, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 4535111b4b0147d887e28d58f22e1a16461a2266
5 changes: 4 additions & 1 deletion test/AddOption/args-and-targets.py
Original file line number Diff line number Diff line change
@@ -113,11 +113,12 @@
if 'A' in BUILD_TARGETS:
BUILD_TARGETS.append('B')
print(str(GetOption('extra')))
print(COMMAND_LINE_TARGETS)
print(BUILD_TARGETS)
""")

# Nested target
test.run('-Q -q -x A TARG1', status=1, stdout="A\n\\['TARG1'\\]\n")
test.run('-Q -q -x A A TARG1', status=1, stdout="A\n\\['A', 'TARG1', 'B'\\]\n")

test.write('SConstruct', """\
env = Environment()
@@ -153,6 +154,8 @@
File ".+SCons/Script/SConsOptions.py", line \\d+:
return getattr\\(self.__dict__\\['__defaults__'\\], attr\\)
""")
test.run('-Q -q -x A A --foo=C TARG1', status=1, stdout="A\nC\n\\['A', 'TARG1'\\]\n")



test.pass_test()