summaryrefslogtreecommitdiffstats
path: root/test/Deprecated/SourceCode
diff options
context:
space:
mode:
authorRobert Managan <ramanagan@att.net>2012-12-15 06:00:17 (GMT)
committerRobert Managan <ramanagan@att.net>2012-12-15 06:00:17 (GMT)
commita27fa15ddc3af3e1ee3dfe2488fa499ba906dfda (patch)
tree737dc474ead899b9157657453364730679816a47 /test/Deprecated/SourceCode
parent3cf978d7964fb474f8a6219f48008f07913aabec (diff)
parent1bf9aa83fc024950012dd76d110443fc2d30c92a (diff)
downloadSCons-a27fa15ddc3af3e1ee3dfe2488fa499ba906dfda.zip
SCons-a27fa15ddc3af3e1ee3dfe2488fa499ba906dfda.tar.gz
SCons-a27fa15ddc3af3e1ee3dfe2488fa499ba906dfda.tar.bz2
merge in changes from SCons default
Diffstat (limited to 'test/Deprecated/SourceCode')
-rw-r--r--test/Deprecated/SourceCode/Perforce/Perforce.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/test/Deprecated/SourceCode/Perforce/Perforce.py b/test/Deprecated/SourceCode/Perforce/Perforce.py
index d732b57..ebf9cfb 100644
--- a/test/Deprecated/SourceCode/Perforce/Perforce.py
+++ b/test/Deprecated/SourceCode/Perforce/Perforce.py
@@ -85,13 +85,8 @@ class TestPerforce(TestSCons.TestSCons):
# We don't use self.run() because the TestCmd logic will hang
# waiting for the daemon to exit, even when we pass it
# the -d option.
- try:
- spawnv = os.spawnv
- except AttributeError:
- os.system(' '.join(args))
- else:
- spawnv(os.P_NOWAIT, self.p4d, args)
- self.sleep(2)
+ os.spawnv(os.P_NOWAIT, self.p4d, args)
+ self.sleep(2)
else:
import socket
s = socket.socket()