diff options
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 7 | ||||
| -rw-r--r-- | test/CPPPATH/subdir-as-include.py | 92 |
3 files changed, 101 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 8dbe8d5..618c9e2 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -21,6 +21,11 @@ RELEASE 1.X - XXX - Reorder MSVC compilation arguments so the /Fo is first. + From John Gozde: + + - When scanning for a #include file, don't use a directory that + has the same name as the file. + From Jared Grubb: - Fix VariantDir duplication of #included files in subdirectories. diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index b8762dc..02dcdbf 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -2014,13 +2014,14 @@ class RootDir(Dir): dir_name, file_name = os.path.split(p) dir_node = self._lookup_abs(dir_name, Dir) result = klass(file_name, dir_node, self.fs) - self._lookupDict[k] = result - dir_node.entries[_my_normcase(file_name)] = result - dir_node.implicit = None # Double-check on disk (as configured) that the Node we # created matches whatever is out there in the real world. result.diskcheck_match() + + self._lookupDict[k] = result + dir_node.entries[_my_normcase(file_name)] = result + dir_node.implicit = None else: # There is already a Node for this path name. Allow it to # complain if we were looking for an inappropriate type. diff --git a/test/CPPPATH/subdir-as-include.py b/test/CPPPATH/subdir-as-include.py new file mode 100644 index 0000000..5ec0b16 --- /dev/null +++ b/test/CPPPATH/subdir-as-include.py @@ -0,0 +1,92 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# 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__" + +""" +This is an obscure test case. When a file without a suffix is included in +a c++ build and there is a directory with the same name as that file in a +sub-build directory, verify that an Errno 21 is not thrown upon trying to +recursively scan the contents of includes. The Errno 21 indicates that +the directory with the same name was trying to be scanned as the include +file, which it clearly is not. +""" + +import TestSCons + +_exe = TestSCons._exe + +test = TestSCons.TestSCons() + +test.subdir('inc1', ['inc1', 'iterator']) + +test.write('SConstruct', """ +env = Environment(CPPPATH = [Dir('inc1')]) +env.Program('prog.cpp') + +Export('env') +SConscript('inc1/SConscript', build_dir='inc1/build', duplicate=0) +""") + +test.write('prog.cpp', """\ +#include <stdio.h> +#include <stdlib.h> + +#include "one.h" +#include <iterator> +int main(int argc, char* argv[]) +{ + printf("%s\\n", ONE); + return 0; +} +""") + +test.write(['inc1', 'SConscript'], """\ +Import('env') +oneenv = env.Clone() +oneenv.Program('one.cpp') +""") + +test.write(['inc1', 'one.h'], """\ +#define ONE "1" +""") + +test.write(['inc1', 'one.cpp'], """\ +#include <iterator> +#include <stdio.h> +#include "one.h" + +int main(int argc, char* argv[]) +{ + printf("%s\\n", ONE); + return 0; +} +""") + +test.run(arguments = '.') + +test.run(program = test.workpath('prog' + _exe), stdout = "1\n") +test.run(program = test.workpath('inc1/build/one' + _exe), stdout = "1\n") + +test.pass_test() |