Really take care of non-existent drive letters on Win32.

1 files changed, 1 insertions, 55 deletions

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()