From 454239b699f5b3b81ef3b10aa3e97361eadbf5f4 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Sat, 30 Nov 2002 05:30:47 +0000 Subject: Really take care of non-existent drive letters on Win32. --- src/engine/SCons/Node/FS.py | 15 ++++-- src/engine/SCons/Node/FSTests.py | 31 ++++++++++-- test/bad-drive.py | 104 +++++++++++++++++++++++++++++++++++++++ test/nonexistent.py | 56 +-------------------- 4 files changed, 142 insertions(+), 64 deletions(-) create mode 100644 test/bad-drive.py diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index d5247f7..b805d4a 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -820,7 +820,7 @@ class File(Entry): def scanner_key(self): return os.path.splitext(self.name)[1] - def __createDir(self): + def _createDir(self): # ensure that the directories for this node are # created. @@ -830,7 +830,10 @@ class File(Entry): if parent.exists(): break listDirs.append(parent) - parent = parent.up() + p = parent.up() + if isinstance(p, ParentOfRoot): + raise SCons.Errors.StopError, parent.path + parent = p listDirs.reverse() for dirnode in listDirs: try: @@ -862,7 +865,11 @@ class File(Entry): if hasattr(self, '_exists'): delattr(self, '_exists') else: - self.__createDir() + try: + self._createDir() + except SCons.Errors.StopError, drive: + desc = "No drive `%s' for target `%s'." % (drive, self) + raise SCons.Errors.StopError, desc def remove(self): """Remove this file.""" @@ -880,7 +887,7 @@ class File(Entry): os.unlink(self.abspath) except OSError: pass - self.__createDir() + self._createDir() file_link(src.abspath, self.abspath) self.created = 1 diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py index 5d32873..8386f83 100644 --- a/src/engine/SCons/Node/FSTests.py +++ b/src/engine/SCons/Node/FSTests.py @@ -31,7 +31,7 @@ import time import unittest import SCons.Node.FS from TestCmd import TestCmd -from SCons.Errors import UserError +import SCons.Errors import stat built_it = None @@ -255,7 +255,7 @@ class BuildDirTestCase(unittest.TestCase): try: fs = SCons.Node.FS.FS() fs.BuildDir('build', '/test/foo') - except UserError: + except SCons.Errors.UserError: exc_caught = 1 assert exc_caught, "Should have caught a UserError." @@ -263,7 +263,7 @@ class BuildDirTestCase(unittest.TestCase): try: fs = SCons.Node.FS.FS() fs.BuildDir('build', 'build/src') - except UserError: + except SCons.Errors.UserError: exc_caught = 1 assert exc_caught, "Should have caught a UserError." @@ -604,7 +604,7 @@ class FSTestCase(unittest.TestCase): def nonexistent(method, s): try: x = method(s, create = 0) - except UserError: + except SCons.Errors.UserError: pass else: raise TestFailed, "did not catch expected UserError" @@ -923,7 +923,27 @@ class StringDirTestCase(unittest.TestCase): f = fs.File('file', 'sub') assert str(f) == os.path.join('sub', 'file') assert not f.exists() - + +class prepareTestCase(unittest.TestCase): + def runTest(self): + """Test the prepare() method""" + + class MyFile(SCons.Node.FS.File): + def _createDir(self): + raise SCons.Errors.StopError + def exists(self): + return None + + fs = SCons.Node.FS.FS() + file = MyFile('foo', fs.Dir('.'), fs) + + exc_caught = 0 + try: + file.prepare() + except SCons.Errors.StopError: + exc_caught = 1 + assert exc_caught, "Should have caught a StopError." + if __name__ == "__main__": suite = unittest.TestSuite() @@ -932,5 +952,6 @@ if __name__ == "__main__": suite.addTest(RepositoryTestCase()) suite.addTest(find_fileTestCase()) suite.addTest(StringDirTestCase()) + suite.addTest(prepareTestCase()) if not unittest.TextTestRunner().run(suite).wasSuccessful(): sys.exit(1) diff --git a/test/bad-drive.py b/test/bad-drive.py new file mode 100644 index 0000000..92803e5 --- /dev/null +++ b/test/bad-drive.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python +# +# Copyright (c) 2001, 2002 Steven Knight +# +# 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. +# + +""" +This test verifies (on Windows systems) that we fail gracefully and +provide informative messages if someone tries to use a path name +with an invalid drive letter. +""" + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import os +import os.path +import string +import sys + +import TestSCons + +test = TestSCons.TestSCons() + +if sys.platform != 'win32': + test.pass_test() + +bad_drive = None +for i in range(len(string.uppercase)-1, -1, -1): + d = string.uppercase[i] + if not os.path.isdir(d + ':' + os.sep): + bad_drive = d + ':' + break + +if bad_drive is None: + print "All drive letters appear to be in use." + print "Cannot test SCons handling of invalid Win32 drive letters." + test.no_result(1); + +test.write('SConstruct', """ +def cat(env, source, target): + target = str(target[0]) + source = map(str, source) + print 'cat(%%s) > %%s' %% (source, target) + f = open(target, "wb") + for src in source: + f.write(open(src, "rb").read()) + f.close() + +bad_drive = '%s' +env = Environment(BUILDERS={'Build':Builder(action=cat)}) +env.Build('aaa.out', 'aaa.in') +env.Build(bad_drive + 'no_target_1', 'bbb.exists') +env.Build(bad_drive + 'no_target_2', 'ccc.does_not_exist') +env.Build('ddd.out', bad_drive + 'no_source') +""" % (bad_drive + '\\' + os.sep)) + +bad_drive = bad_drive + os.sep + +test.write("aaa.in", "aaa.in\n") +test.write("bbb.exists", "bbb.exists\n") + +test.write("no_target_1", "no_target_1\n") +test.write("no_target_2", "no_target_2\n") +test.write("no_source", "no_source\n") + +test.run(arguments = 'aaa.out') + +test.fail_test(test.read('aaa.out') != "aaa.in\n") + +test.run(arguments = bad_drive + 'not_mentioned', + stderr = "scons: *** Do not know how to make target `%snot_mentioned'. Stop.\n" % bad_drive, + status = 2) + +test.run(arguments = bad_drive + 'no_target_1', + stderr = "scons: *** No drive `%s' for target `%sno_target_1'. Stop.\n" % (bad_drive, bad_drive), + status = 2) + +test.run(arguments = bad_drive + 'no_target_2', + stderr = "scons: *** No Builder for target `ccc.does_not_exist', needed by `%sno_target_2'. Stop.\n" % bad_drive, + status = 2) + +test.run(arguments = 'ddd.out', + stderr = "scons: *** No Builder for target `%sno_source', needed by `ddd.out'. Stop.\n" % bad_drive, + status = 2) + +test.pass_test() diff --git a/test/nonexistent.py b/test/nonexistent.py index 3604a29..6219c1c 100644 --- a/test/nonexistent.py +++ b/test/nonexistent.py @@ -25,17 +25,11 @@ """ This test verifies that we fail gracefully and provide informative messages if someone tries to build a target that hasn't been defined -or uses a nonexistent source file. On Windows systems, it checks -to make sure that this applies to invalid drive letters as well. +or uses a nonexistent source file. """ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os -import os.path -import string -import sys - import TestSCons test = TestSCons.TestSCons() @@ -66,52 +60,4 @@ scons: *** No Builder for target `aaa.in', needed by `aaa.out'. """, status = 2) -if sys.platform == 'win32': - bad_drive = None - for i in range(len(string.uppercase)-1, -1, -1): - d = string.uppercase[i] - if not os.path.isdir(d + ':' + os.sep): - bad_drive = d + ':' + '\\' + os.sep - break - - if bad_drive is None: - print "All drive letters appear to be in use." - print "Cannot test SCons handling of invalid Win32 drive letters." - test.no_result(1); - - test.write('SConstruct', """ -def cat(env, source, target): - target = str(target[0]) - source = map(str, source) - print 'cat(%%s) > %%s' %% (source, target) - f = open(target, "wb") - for src in source: - f.write(open(src, "rb").read()) - f.close() - -bad_drive = '%s' -env = Environment(BUILDERS={'Build':Builder(action=cat)}) -env.Build('aaa.out', 'aaa.in') -env.Build(bad_drive + 'no_target', 'bbb.in') -env.Build('ccc.out', bad_drive + 'no_source') -""" % bad_drive) - - test.write("aaa.in", "aaa.in\n") - - test.write("no_target", "no_target\n") - - test.write("no_source", "no_source\n") - - test.run(arguments = 'aaa.out') - - test.fail_test(test.read('aaa.out') != "aaa.in\n") - - test.run(arguments = bad_drive + 'no_target', - stderr = "scons: *** Do not know how to make target `%sno_target'. Stop.\n" % bad_drive, - status = 2) - - test.run(arguments = 'ccc.out', - stderr = "scons: *** No Builder for target `%sno_source', needed by `ccc.out'. Stop.\n" % bad_drive, - status = 2) - test.pass_test() -- cgit v0.12