diff options
| author | Daniel Moody <dmoody256@gmail.com> | 2021-07-20 22:28:50 -0500 |
|---|---|---|
| committer | Daniel Moody <dmoody256@gmail.com> | 2021-07-20 22:28:50 -0500 |
| commit | f21e3619a235d1a839413beb2d92673bdfdd801d (patch) | |
| tree | 2e00de10c13e407720fd1b2b0abcc540905f16f6 | |
| parent | ddce6091aae19f3405e718a981c6e50ac9a824c7 (diff) | |
| download | scons-git-f21e3619a235d1a839413beb2d92673bdfdd801d.tar.gz | |
fixed minor issues related to is_conftest for PR
| -rw-r--r-- | SCons/Builder.py | 2 | ||||
| -rw-r--r-- | test/Configure/is_conftest/fixture/SConstruct | 2 | ||||
| -rw-r--r-- | test/Configure/is_conftest/is_conftest.py | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/SCons/Builder.py b/SCons/Builder.py index 1178884b1..94723456e 100644 --- a/SCons/Builder.py +++ b/SCons/Builder.py @@ -614,7 +614,7 @@ class BuilderBase: t.set_explicit(self.is_explicit) if env.get("SCONF_NODE"): - for node in tlist + slist: + for node in tlist: node.attributes.conftest_node = 1 return SCons.Node.NodeList(tlist) diff --git a/test/Configure/is_conftest/fixture/SConstruct b/test/Configure/is_conftest/fixture/SConstruct index 8118db285..b0d42886c 100644 --- a/test/Configure/is_conftest/fixture/SConstruct +++ b/test/Configure/is_conftest/fixture/SConstruct @@ -17,7 +17,7 @@ if not conf.TryRun("int main( int argc, char* argv[] ){return 0;}", '.c'): env = conf.Finish() -for node in env.Glob('.sconf_temp/*'): +for node in env.Glob(conf.confdir.path + '/*'): if not node.is_conftest(): print("FAIL") diff --git a/test/Configure/is_conftest/is_conftest.py b/test/Configure/is_conftest/is_conftest.py index e1f49de51..8dab66df9 100644 --- a/test/Configure/is_conftest/is_conftest.py +++ b/test/Configure/is_conftest/is_conftest.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# __COPYRIGHT__ +# MIT License +# +# Copyright The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -20,12 +22,9 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ -Verify is_conftest is marking nodes. +Verify is_conftest is marking nodes, even for intermediate files. """ import TestSCons |