Fix a regression in handling CPPPATH='.' when using a BuildDir with subdirectories in the search path.

1 files changed, 0 insertions, 171 deletions

diff --git a/test/BuildDir-errors.py b/test/BuildDir-errors.py
deleted file mode 100644
index 93cd3ec..0000000
--- a/test/BuildDir-errors.py
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/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__"
-
-"""
-Validate successful handling of errors when duplicating things in
-BuildDirs.  This is generally when the BuildDir, or something in it,
-is read-only.
-"""
-
-import os
-import os.path
-import stat
-import sys
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-for dir in ['normal', 'ro-dir', 'ro-SConscript', 'ro-src']:
-    test.subdir(dir, [dir, 'src'])
-
-    test.write([dir, 'SConstruct'], """\
-import os.path
-BuildDir('build', 'src')
-SConscript(os.path.join('build', 'SConscript'))
-""") 
-
-    test.write([dir, 'src', 'SConscript'], """\
-def fake_scan(node, env, target):
-    # We fetch the contents here, even though we don't examine
-    # them, because get_contents() will cause the engine to
-    # try to link the source file into the build directory,
-    # potentially triggering a different failure case.
-    contents = node.get_contents()
-    return []
-
-def cat(env, source, target):
-    target = str(target[0])
-    source = map(str, source)
-    f = open(target, "wb")
-    for src in source:
-        f.write(open(src, "rb").read())
-    f.close()
-
-env = Environment(BUILDERS={'Build':Builder(action=cat)},
-                  SCANNERS=[Scanner(fake_scan, skeys = ['.in'])])
-
-# Do some Node test operations to ensure no side-effects cause failures
-File('file.in').exists()
-File('file.in').is_derived()
-File('file.in').is_pseudo_derived()
-
-env.Build('file.out', 'file.in')
-""")
-
-    test.write([dir, 'src', 'file.in'], dir + "/src/file.in\n")
-
-# Just verify that the normal case works fine.
-test.run(chdir = 'normal', arguments = ".")
-
-test.fail_test(test.read(['normal', 'build', 'file.out']) != "normal/src/file.in\n")
-
-# Verify the error when the BuildDir itself is read-only.  Don't bother
-# to test this on Win32, because the ACL (I think) still allows the
-# owner to create files in the directory even when it's read-only.
-if sys.platform != 'win32':
-    dir = os.path.join('ro-dir', 'build')
-    test.subdir(dir)
-    os.chmod(dir, os.stat(dir)[stat.ST_MODE] & ~stat.S_IWUSR)
-
-    test.run(chdir = 'ro-dir',
-             arguments = ".",
-             status = 2,
-             stderr = "scons: *** Cannot duplicate `%s' in `build': Permission denied.  Stop.\n" % os.path.join('src', 'SConscript'))
-
-# Verify the error when the SConscript file within the BuildDir is
-# read-only.  Note that we have to make the directory read-only too,
-# because otherwise our duplication logic will be able to unlink
-# the read-only SConscript and duplicate the new one.
-dir = os.path.join('ro-SConscript', 'build')
-test.subdir(dir)
-SConscript = test.workpath(dir, 'SConscript')
-test.write(SConscript, '')
-os.chmod(SConscript, os.stat(SConscript)[stat.ST_MODE] & ~stat.S_IWUSR)
-f = open(SConscript, 'r')
-os.chmod(dir, os.stat(dir)[stat.ST_MODE] & ~stat.S_IWUSR)
-
-test.run(chdir = 'ro-SConscript',
-         arguments = ".",
-         status = 2,
-         stderr = "scons: *** Cannot duplicate `%s' in `build': Permission denied.  Stop.\n" % os.path.join('src', 'SConscript'))
-
-os.chmod('ro-SConscript', os.stat('ro-SConscript')[stat.ST_MODE] | stat.S_IWUSR)
-f.close()
-
-test.run(chdir = 'ro-SConscript',
-         arguments = ".",
-         status = 2,
-         stderr = "scons: *** Cannot duplicate `%s' in `build': Permission denied.  Stop.\n" % os.path.join('src', 'SConscript'))
-
-# Verify the error when the source file within the BuildDir is
-# read-only.  Note that we have to make the directory read-only too,
-# because otherwise our duplication logic will be able to unlink the
-# read-only source file and duplicate the new one.  But because we've
-# made the BuildDir read-only, we must also create a writable SConscript
-# file there so it can be duplicated from the source directory.
-dir = os.path.join('ro-src', 'build')
-test.subdir(dir)
-test.write([dir, 'SConscript'], '')
-file_in = test.workpath(dir, 'file.in')
-test.write(file_in, '')
-os.chmod(file_in, os.stat(file_in)[stat.ST_MODE] & ~stat.S_IWUSR)
-f = open(file_in, 'r')
-os.chmod(dir, os.stat(dir)[stat.ST_MODE] & ~stat.S_IWUSR)
-
-test.run(chdir = 'ro-src',
-         arguments = ".",
-         status = 2,
-         stderr = """\
-scons: *** Cannot duplicate `%s' in `build': Permission denied.  Stop.
-""" % (os.path.join('src', 'file.in')))
-
-test.run(chdir = 'ro-src',
-         arguments = "-k .",
-         status = 2,
-         stderr = """\
-scons: *** Cannot duplicate `%s' in `build': Permission denied.  Stop.
-""" % (os.path.join('src', 'file.in')))
-
-f.close()
-
-# ensure that specifying multiple source directories for one
-# build directory results in an error message, rather
-# than just silently failing.
-test.subdir('duplicate', ['duplicate', 'src1'], ['duplicate', 'src2'])
-test.write(['duplicate', 'SConstruct'], """\
-BuildDir('build', 'src1')
-BuildDir('build', 'src2')
-""")
-
-test.run(chdir = 'duplicate',
-         arguments = ".",
-         status = 2,
-         stderr = """
-scons: *** 'build' already has a source directory: 'src1'.
-File "SConstruct", line 2, in ?
-""")
-
-test.pass_test()