Change posix.py to use subprocess as we only support python 2.4.

Added a test for leaking handles.

2 files changed, 61 insertions, 10 deletions

diff --git a/test/builderrors.py b/test/builderrors.py
index 0133107..3d443bf 100644
--- a/test/builderrors.py
+++ b/test/builderrors.py
@@ -107,9 +107,6 @@ test.fail_test(os.path.exists(test.workpath('f3.out')))
 
 test.write('SConstruct', """
 env=Environment()
-if env['PLATFORM'] == 'posix':
-    from SCons.Platform.posix import fork_spawn
-    env['SPAWN'] = fork_spawn
 env['ENV']['PATH'] = ''
 env.Command(target='foo.out', source=[], action='not_a_program')
 """)
@@ -123,9 +120,6 @@ test.must_not_contain_any_line(test.stderr(), ['Exception', 'Traceback'])
 long_cmd = 'xyz ' + "foobarxyz" * 100000
 test.write('SConstruct', """
 env=Environment()
-if env['PLATFORM'] == 'posix':
-    from SCons.Platform.posix import fork_spawn
-    env['SPAWN'] = fork_spawn
 env.Command(target='longcmd.out', source=[], action='echo %s')
 """%long_cmd)
 
@@ -147,9 +141,6 @@ test.must_not_contain_any_line(test.stderr(), ['Exception', 'Traceback'])
 # with error "Permission denied" or "No such file or directory".
 test.write('SConstruct', """
 env=Environment()
-if env['PLATFORM'] in ('posix', 'darwin'):
-    from SCons.Platform.posix import fork_spawn
-    env['SPAWN'] = fork_spawn
 env['SHELL'] = 'one'
 env.Command(target='badshell.out', source=[], action='foo')
 """)
@@ -191,7 +182,7 @@ env2.Install("target", "dir2/myFile")
 def print_build_failures():
     from SCons.Script import GetBuildFailures
     for bf in GetBuildFailures():
-	print bf.action
+    print bf.action
 
 atexit.register(print_build_failures)
 """)
diff --git a/test/leaky-handles.py b/test/leaky-handles.py
new file mode 100644
index 0000000..9502d1b
--- /dev/null
+++ b/test/leaky-handles.py
@@ -0,0 +1,60 @@
+#!/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__"
+
+"""
+Verify that file handles aren't leaked to child processes
+"""
+
+import os
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+if os.name != 'posix':
+    msg = "Skipping fork leak test on non-posix platform '%s'\n" % os.name
+    test.skip_test(msg)
+
+test.write('SConstruct', """
+
+#Leak a file handle
+open('/dev/null')
+
+#Check it gets closed
+test2 = Command('test2', [], '@ls /proc/$$$$/fd|wc -l')
+""")
+
+# In theory that should have 3 lines (handles 0/1/2). This is v. unix specific
+
+test.run(arguments = '-Q', stdout='3\n')
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: